0.9.9 Version

README.md

@@ -1,7 +1,9 @@
-# ViaVersion 0.9.7
+# ViaVersion 0.9.9
 [![Build Status](https://travis-ci.org/MylesIsCool/ViaVersion.svg?branch=master)](https://travis-ci.org/MylesIsCool/ViaVersion)
 [![Gitter](https://badges.gitter.im/MylesIsCool/ViaVersion.svg)](https://gitter.im/MylesIsCool/ViaVersion)
 
+IRC: [#viaversion](http://buzz.spi.gt/iris/?channels=viaversion) on irc.spi.gt for Support.
+
 **Allows the connection of higher client versions to lower server versions**
 
 Allows 1.10, 1.9 on 1.8 server and 1.10 on a 1.9 server.
@@ -14,40 +16,14 @@ Allows 1.10, 1.9 on 1.8 server and 1.10 on a 1.9 server.
 
 Sources:
 --------
+**wiki.vg** (Used for various information, we also contribute back)
 
-**wiki.vg** (Protocol info, though I did have to find a lot myself)
-
-**Burger** We use this tool to get protocol and other useful information for new / undocumented Minecraft versions
+**Burger** (See [PAaaS](https://github.com/Matsv/Paaas))
 
 **OpenNBT** (used for slot rewriting)
 
 
 
-All Time Contributors:
---------
-
-**Myself** (harhar)
-
-**Matsv**
-
-**HugoDaBosss**
-
-**SanderGielisse**
-
-**Paulomart**
-
-**gigosaurus**
-
-**fillefilip8**
-
-**lenis0012**
-
-**fuzzy_bot**
-
-**joserobjr**
-
-
-
 Releases / Dev Builds:
 --------
 You can find official releases here:
@@ -70,5 +46,5 @@ License:
 
 MIT License, see LICENSE for more details.
 
-Thanks!
 
+Special thanks to all our [Contributors](https://github.com/MylesIsCool/ViaVersion/graphs/contributors)

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion</artifactId>
-    <version>0.9.7</version>
+    <version>0.9.9</version>
     <packaging>jar</packaging>
 
     <name>ViaVersion</name>

src/main/java/us/myles/ViaVersion/ViaConfig.java

@@ -180,4 +180,9 @@ public class ViaConfig implements ViaVersionConfig {
     public String getBlockedDisconnectMsg() {
         return plugin.getConfig().getString("block-disconnect-msg", "You are using an unsupported Minecraft version!");
     }
+
+    @Override
+    public String getReloadDisconnectMsg() {
+        return plugin.getConfig().getString("reload-disconnect-msg", "Server reload, please rejoin!");
+    }
 }

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

@@ -7,6 +7,7 @@ import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import lombok.Getter;
 import lombok.NonNull;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
@@ -20,6 +21,7 @@ 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.protocol.ProtocolRegistry;
+import us.myles.ViaVersion.api.protocol.ProtocolVersion;
 import us.myles.ViaVersion.boss.ViaBossBar;
 import us.myles.ViaVersion.classgenerator.ClassGenerator;
 import us.myles.ViaVersion.commands.ViaCommandHandler;
@@ -59,7 +61,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         protocolSupport = Bukkit.getPluginManager().getPlugin("ProtocolSupport") != null;
 
         if (protocolSupport) {
-            getLogger().info("Patching to prevent concurrency issues...");
+            getLogger().info("Hooking into ProtocolSupport, to prevent issues!");
             try {
                 patchLists();
             } catch (Exception e) {
@@ -79,11 +81,11 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
             if (Bukkit.getPluginManager().getPlugin("ProtocolLib") != null) {
                 getLogger().severe("ViaVersion is already loaded, we're going to kick all the players... because otherwise we'll crash because of ProtocolLib.");
                 for (Player player : Bukkit.getOnlinePlayers()) {
-                    player.kickPlayer("Server reload, please rejoin!");
+                    player.kickPlayer(ChatColor.translateAlternateColorCodes('&', getConf().getReloadDisconnectMsg()));
                 }
 
             } else {
-                getLogger().severe("ViaVersion is already loaded, this should work fine... Otherwise reboot the server!!!");
+                getLogger().severe("ViaVersion is already loaded, this should work fine. If you get any console errors, try rebooting.");
 
             }
         }
@@ -124,9 +126,9 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
                 gatherProtocolVersion();
                 // Check if there are any pipes to this version
                 if (ProtocolRegistry.SERVER_PROTOCOL != -1) {
-                    getLogger().info("ViaVersion detected protocol version: " + ProtocolRegistry.SERVER_PROTOCOL);
+                    getLogger().info("ViaVersion detected server version: " + ProtocolVersion.getProtocol(ProtocolRegistry.SERVER_PROTOCOL));
                     if (!ProtocolRegistry.isWorkingPipe()) {
-                        getLogger().warning("ViaVersion will not function on the current protocol.");
+                        getLogger().warning("ViaVersion does not have any compatible versions for this server version, please read our resource page carefully.");
                     }
                 }
                 ProtocolRegistry.refreshVersions();
@@ -150,7 +152,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
 
     @Override
     public void onDisable() {
-        getLogger().info("ViaVersion is disabling, if this is a reload it may not work.");
+        getLogger().info("ViaVersion is disabling, if this is a reload and you experience issues consider rebooting.");
         uninject();
     }
 
@@ -221,7 +223,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         try {
             Object connection = getServerConnection();
             if (connection == null) {
-                getLogger().warning("We failed to find the ServerConnection? :( What server are you running?");
+                getLogger().warning("We failed to find the core component 'ServerConnection', please file an issue on our GitHub.");
                 return;
             }
             for (Field field : connection.getClass().getDeclaredFields()) {
@@ -255,7 +257,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
             }
             System.setProperty("ViaVersion", getDescription().getVersion());
         } catch (Exception e) {
-            getLogger().severe("Unable to inject handlers, are you on 1.8? ");
+            getLogger().severe("Unable to inject ViaVersion, please post these details on our GitHub and ensure you're using a compatible server version.");
             e.printStackTrace();
         }
     }
@@ -264,7 +266,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
     public void patchLists() throws Exception {
         Object connection = getServerConnection();
         if (connection == null) {
-            getLogger().warning("We failed to find the ServerConnection? :( What server are you running?");
+            getLogger().warning("We failed to find the core component 'ServerConnection', please file an issue on our GitHub.");
             return;
         }
         for (Field field : connection.getClass().getDeclaredFields()) {
@@ -324,12 +326,12 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
                     PluginDescriptionFile yaml = ReflectionUtil.get(cl, "description", PluginDescriptionFile.class);
                     throw new Exception("Unable to inject, due to " + bootstrapAcceptor.getClass().getName() + ", try without the plugin " + yaml.getName() + "?");
                 } else {
-                    throw new Exception("Unable to find childHandler, weird server version? " + bootstrapAcceptor.getClass().getName());
+                    throw new Exception("Unable to find core component 'childHandler', please check your plugins. issue: " + bootstrapAcceptor.getClass().getName());
                 }
 
             }
         } catch (Exception e) {
-            getLogger().severe("Have you got late-bind enabled with something else?");
+            getLogger().severe("We failed to inject ViaVersion, have you got late-bind enabled with something else?");
             e.printStackTrace();
         }
     }
@@ -344,7 +346,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
                     ReflectionUtil.set(bootstrapAcceptor, "childHandler", ((ViaVersionInitializer) oldInit).getOriginal());
                 }
             } catch (Exception e) {
-                System.out.println("Failed to remove injection... reload won't work with connections sorry");
+                System.out.println("Failed to remove injection handler, reload won't work with connections, please reboot!");
             }
         }
         injectedFutures.clear();
@@ -356,7 +358,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
                     pair.getKey().set(pair.getValue(), ((ListWrapper) o).getOriginalList());
                 }
             } catch (IllegalAccessException e) {
-                System.out.println("Failed to remove injection... reload might not work with connections sorry");
+                System.out.println("Failed to remove injection, reload won't work with connections, please reboot!");
             }
         }
 

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

@@ -0,0 +1,75 @@
+package us.myles.ViaVersion.api;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+
+import java.util.UUID;
+
+@Getter(AccessLevel.PROTECTED)
+@RequiredArgsConstructor
+public abstract class ViaListener implements Listener {
+    private final ViaVersionPlugin plugin;
+    private final Class<? extends Protocol> requiredPipeline;
+    private boolean registered = false;
+
+    /**
+     * Get the UserConnection from a player
+     *
+     * @param player Player object
+     * @return The UserConnection
+     */
+    protected UserConnection getUserConnection(@NonNull Player player) {
+        return getUserConnection(player.getUniqueId());
+    }
+
+    /**
+     * Get the UserConnection from an UUID
+     *
+     * @param uuid UUID object
+     * @return The UserConnection
+     */
+    protected UserConnection getUserConnection(@NonNull UUID uuid) {
+        if (!plugin.isPorted(uuid)) return null;
+        return plugin.getConnection(uuid);
+    }
+
+    /**
+     * Checks if the player is on the selected pipe
+     *
+     * @param player Player Object
+     * @return True if on pipe
+     */
+    protected boolean isOnPipe(Player player) {
+        return isOnPipe(player.getUniqueId());
+    }
+
+    /**
+     * Checks if the UUID is on the selected pipe
+     *
+     * @param uuid UUID Object
+     * @return True if on pipe
+     */
+    protected boolean isOnPipe(UUID uuid) {
+        UserConnection userConnection = getUserConnection(uuid);
+        return userConnection != null &&
+                userConnection.get(ProtocolInfo.class).getPipeline().contains(requiredPipeline);
+    }
+
+    /**
+     * Register as Bukkit event
+     */
+    public void register() {
+        if (registered) return;
+
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+        registered = true;
+    }
+}

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

@@ -17,6 +17,7 @@ public interface ViaVersionAPI {
      *
      * @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);
 
@@ -42,7 +43,9 @@ public interface ViaVersionAPI {
      *
      * @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);
 
     /**
@@ -116,9 +119,9 @@ public interface ViaVersionAPI {
     /**
      * Get the supported protocol versions
      * This method removes any blocked protocol versions.
-     * @see ProtocolRegistry#getSupportedVersions() for full list.
      *
      * @return a list of protocol versions
+     * @see ProtocolRegistry#getSupportedVersions() for full list.
      */
     SortedSet<Integer> getSupportedVersions();
 

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

@@ -209,4 +209,12 @@ public interface ViaVersionConfig {
      * @return Disconnect message
      */
     String getBlockedDisconnectMsg();
+
+    /**
+     * Get the message sent to players being kicked on reload.
+     * Players are kicked to stop the server crashing
+     *
+     * @return Disconnect message
+     */
+    String getReloadDisconnectMsg();
 }

src/main/java/us/myles/ViaVersion/api/minecraft/chunks/Chunk.java

@@ -1,5 +1,9 @@
 package us.myles.ViaVersion.api.minecraft.chunks;
 
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
+
+import java.util.List;
+
 public interface Chunk {
     int getX();
 
@@ -14,4 +18,6 @@ public interface Chunk {
     byte[] getBiomeData();
 
     int getBitmask();
+
+    List<CompoundTag> getBlockEntities();
 }

src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java

@@ -91,4 +91,9 @@ public class ProtocolVersion {
     public int hashCode() {
         return id;
     }
+
+    @Override
+    public String toString() {
+        return String.format("%s(%d)", this.getName(), this.getId());
+    }
 }

src/main/java/us/myles/ViaVersion/api/type/types/version/Metadata1_8Type.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9to1_8.types;
+package us.myles.ViaVersion.api.type.types.version;
 
 
 import io.netty.buffer.ByteBuf;
@@ -6,7 +6,7 @@ import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.type.types.minecraft.MetaTypeTemplate;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.MetadataTypes;
 
-public class MetadataType extends MetaTypeTemplate {
+public class Metadata1_8Type extends MetaTypeTemplate {
 
     @Override
     public Metadata read(ByteBuf buffer) throws Exception {
@@ -19,13 +19,9 @@ public class MetadataType extends MetaTypeTemplate {
     }
 
     @Override
-    public void write(ByteBuf buffer, Metadata object) throws Exception {
-        if (object == null) {
-            buffer.writeByte(255);
-        } else {
-            buffer.writeByte(object.getId());
-            buffer.writeByte(object.getTypeID());
-            object.getType().write(buffer, object.getValue());
-        }
+    public void write(ByteBuf buffer, Metadata meta) throws Exception {
+        byte item = (byte) (meta.getTypeID() << 5 | meta.getId() & 0x1F);
+        buffer.writeByte(item);
+        meta.getType().write(buffer, meta.getValue());
     }
 }

src/main/java/us/myles/ViaVersion/api/type/types/version/Metadata1_9Type.java

@@ -1,11 +1,11 @@
-package us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types;
+package us.myles.ViaVersion.api.type.types.version;
 
 import io.netty.buffer.ByteBuf;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.type.types.minecraft.MetaTypeTemplate;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType;
 
-public class Meta1_10Type extends MetaTypeTemplate {
+public class Metadata1_9Type extends MetaTypeTemplate {
 
     @Override
     public Metadata read(ByteBuf buffer) throws Exception {

src/main/java/us/myles/ViaVersion/api/type/types/version/MetadataList1_8Type.java

@@ -1,21 +1,20 @@
-package us.myles.ViaVersion.protocols.protocol1_9to1_8.types;
+package us.myles.ViaVersion.api.type.types.version;
 
 import io.netty.buffer.ByteBuf;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.type.types.minecraft.MetaListTypeTemplate;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class MetadataListType extends MetaListTypeTemplate {
+public class MetadataList1_8Type extends MetaListTypeTemplate {
 
     @Override
     public List<Metadata> read(ByteBuf buffer) throws Exception {
         List<Metadata> list = new ArrayList<>();
         Metadata m;
         do {
-            m = Protocol1_9TO1_8.METADATA.read(buffer);
+            m = Types1_8.METADATA.read(buffer);
             if (m != null) {
                 list.add(m);
             }
@@ -26,10 +25,8 @@ public class MetadataListType extends MetaListTypeTemplate {
 
     @Override
     public void write(ByteBuf buffer, List<Metadata> object) throws Exception {
-        for (Metadata m : object) {
-            Protocol1_9TO1_8.METADATA.write(buffer, m);
-        }
-        // Write end of list
-        Protocol1_9TO1_8.METADATA.write(buffer, null);
+        for (Metadata data : object)
+            Types1_8.METADATA.write(buffer, data);
+        buffer.writeByte(127);
     }
 }

src/main/java/us/myles/ViaVersion/api/type/types/version/MetadataList1_9Type.java

@@ -0,0 +1,33 @@
+package us.myles.ViaVersion.api.type.types.version;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.type.types.minecraft.MetaListTypeTemplate;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MetadataList1_9Type extends MetaListTypeTemplate {
+
+    @Override
+    public List<Metadata> read(ByteBuf buffer) throws Exception {
+        List<Metadata> list = new ArrayList<>();
+        Metadata meta;
+        do {
+            meta = Types1_9.METADATA.read(buffer);
+            if (meta != null)
+                list.add(meta);
+        } while (meta != null);
+
+        return list;
+    }
+
+    @Override
+    public void write(ByteBuf buffer, List<Metadata> object) throws Exception {
+        for (Metadata m : object)
+            Types1_9.METADATA.write(buffer, m);
+
+        // Write end of list
+        Types1_9.METADATA.write(buffer, null);
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_8.java

@@ -0,0 +1,18 @@
+package us.myles.ViaVersion.api.type.types.version;
+
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.type.Type;
+
+import java.util.List;
+
+public class Types1_8 {
+    /**
+     * Metadata list type for 1.8
+     */
+    public static Type<List<Metadata>> METADATA_LIST = new MetadataList1_8Type();
+
+    /**
+     * Metadata type for 1.8
+     */
+    public static Type<Metadata> METADATA = new Metadata1_8Type();
+}

src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_9.java

@@ -0,0 +1,18 @@
+package us.myles.ViaVersion.api.type.types.version;
+
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.type.Type;
+
+import java.util.List;
+
+public class Types1_9 {
+    /**
+     * Metadata list type for 1.9
+     */
+    public static final Type<List<Metadata>> METADATA_LIST = new MetadataList1_9Type();
+
+    /**
+     * Metadata type for 1.9
+     */
+    public static final Type<Metadata> METADATA = new Metadata1_9Type();
+}

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

@@ -132,6 +132,7 @@ public class ViaCommandHandler implements ViaVersionCommand, CommandExecutor, Ta
         registerSubCommand(new ListSubCmd());
         registerSubCommand(new PPSSubCmd());
         registerSubCommand(new DebugSubCmd());
+        registerSubCommand(new DumpSubCmd());
         registerSubCommand(new DisplayLeaksSubCmd());
         registerSubCommand(new DontBugMeSubCmd());
         registerSubCommand(new AutoTeamSubCmd());

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

@@ -0,0 +1,94 @@
+package us.myles.ViaVersion.commands.defaultsubs;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+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.ViaSubCommand;
+import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
+import us.myles.ViaVersion.dump.DumpTemplate;
+import us.myles.ViaVersion.dump.PluginInfo;
+import us.myles.ViaVersion.dump.VersionInfo;
+
+import java.io.InputStreamReader;
+import java.io.InvalidObjectException;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+
+public class DumpSubCmd extends ViaSubCommand {
+    private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
+    @Override
+    public String name() {
+        return "dump";
+    }
+
+    @Override
+    public String description() {
+        return "Dump information about your server, this is helpful if you report bugs.";
+    }
+
+    @Override
+    public boolean execute(final CommandSender sender, String[] args) {
+        VersionInfo version = new VersionInfo(
+                Bukkit.getServer().getVersion(),
+                Bukkit.getServer().getBukkitVersion(),
+                System.getProperty("java.version"),
+                System.getProperty("os.name"),
+                ProtocolRegistry.SERVER_PROTOCOL,
+                ProtocolRegistry.getSupportedVersions());
+
+        List<PluginInfo> plugins = new ArrayList<>();
+        for (Plugin p : Bukkit.getPluginManager().getPlugins())
+            plugins.add(new PluginInfo(p.isEnabled(), p.getDescription().getName(), p.getDescription().getVersion(), p.getDescription().getMain(), p.getDescription().getAuthors()));
+
+        Map<String, Object> configuration = ((ViaVersionPlugin) ViaVersion.getInstance()).getConfig().getValues(false);
+
+        final DumpTemplate template = new DumpTemplate(version, configuration, plugins);
+
+        Bukkit.getScheduler().runTaskAsynchronously((ViaVersionPlugin) ViaVersion.getInstance(), new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    HttpURLConnection con = (HttpURLConnection) new URL("http://hastebin.com/documents").openConnection();
+
+                    con.setRequestProperty("Content-Type", "text/plain");
+                    con.setRequestMethod("POST");
+                    con.setDoOutput(true);
+
+                    OutputStream out = con.getOutputStream();
+                    out.write(gson.toJson(template).getBytes(Charset.forName("UTF-8")));
+                    out.close();
+
+                    JsonObject output = gson.fromJson(new InputStreamReader(con.getInputStream()), JsonObject.class);
+                    con.getInputStream().close();
+
+                    if (!output.has("key"))
+                        throw new InvalidObjectException("Key is not given in Hastebin output");
+
+                    sender.sendMessage(ChatColor.GREEN + "We've made a dump with useful information, report your issue and provide this url: " + getUrl(output.get("key").getAsString()));
+                } catch (Exception e) {
+                    sender.sendMessage(ChatColor.RED + "Failed to dump, please check the console for more information");
+                    ((ViaVersionPlugin) ViaVersion.getInstance()).getLogger().log(Level.WARNING, "Could not paste ViaVersion dump to Hastebin", e);
+                }
+            }
+        });
+
+        return true;
+    }
+
+    private String getUrl(String id) {
+        return String.format("http://hastebin.com/%s.json", id);
+    }
+}

src/main/java/us/myles/ViaVersion/dump/DumpTemplate.java

@@ -0,0 +1,15 @@
+package us.myles.ViaVersion.dump;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+public class DumpTemplate {
+    private VersionInfo versionInfo;
+    private Map<String, Object> configuration;
+    private List<PluginInfo> plugins;
+}

src/main/java/us/myles/ViaVersion/dump/PluginInfo.java

@@ -0,0 +1,16 @@
+package us.myles.ViaVersion.dump;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+public class PluginInfo {
+    private boolean enabled;
+    private String name;
+    private String version;
+    private String main;
+    private List<String> authors;
+}

src/main/java/us/myles/ViaVersion/dump/VersionInfo.java

@@ -0,0 +1,18 @@
+package us.myles.ViaVersion.dump;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Set;
+
+@Data
+@AllArgsConstructor
+public class VersionInfo {
+    private String version;
+    private String bukkitVersion;
+    private String javaVersion;
+    private String operatingSystem;
+    private int serverProtocol;
+    private Set<Integer> enabledPipelines;
+}
+

src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java

@@ -8,21 +8,36 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Metadata1_9Type;
+import us.myles.ViaVersion.api.type.types.version.MetadataList1_9Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.storage.ResourcePackTracker;
-import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types.Meta1_10Type;
-import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types.MetaList1_10Type;
 
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 public class Protocol1_10To1_9_3_4 extends Protocol {
-    public static final Type<List<Metadata>> METADATA_LIST = new MetaList1_10Type();
-    public static final Type<Metadata> METADATA = new Meta1_10Type();
+    @Deprecated
+    public static final Type<List<Metadata>> METADATA_LIST = new MetadataList1_9Type();
+    @Deprecated
+    public static final Type<Metadata> METADATA = new Metadata1_9Type();
+
     public static ValueTransformer<Short, Float> toNewPitch = new ValueTransformer<Short, Float>(Type.FLOAT) {
         @Override
         public Float transform(PacketWrapper wrapper, Short inputValue) throws Exception {
             return inputValue / 63.5F;
-
+        }
+    };
+    public static ValueTransformer<List<Metadata>, List<Metadata>> transformMetadata = new ValueTransformer<List<Metadata>, List<Metadata>>(Types1_9.METADATA_LIST) {
+        @Override
+        public List<Metadata> transform(PacketWrapper wrapper, List<Metadata> inputValue) throws Exception {
+            List<Metadata> metaList = new CopyOnWriteArrayList<>(inputValue);
+            for (Metadata m : metaList) {
+                if (m.getId() >= 5)
+                    m.setId(m.getId() + 1);
+            }
+            return metaList;
         }
     };
 
@@ -69,7 +84,7 @@ public class Protocol1_10To1_9_3_4 extends Protocol {
             @Override
             public void registerMap() {
                 map(Type.VAR_INT); // 0 - Entity ID
-                map(METADATA_LIST); // 1 - Metadata list
+                map(Types1_9.METADATA_LIST, transformMetadata); // 1 - Metadata list
             }
         });
 
@@ -89,7 +104,7 @@ public class Protocol1_10To1_9_3_4 extends Protocol {
                 map(Type.SHORT); // 9 - Velocity X
                 map(Type.SHORT); // 10 - Velocity Y
                 map(Type.SHORT); // 11 - Velocity Z
-                map(METADATA_LIST); // 12 - Metadata
+                map(Types1_9.METADATA_LIST, transformMetadata); // 12 - Metadata
             }
         });
 
@@ -104,7 +119,7 @@ public class Protocol1_10To1_9_3_4 extends Protocol {
                 map(Type.DOUBLE); // 4 - Z
                 map(Type.BYTE); // 5 - Yaw
                 map(Type.BYTE); // 6 - Pitch
-                map(METADATA_LIST); // 7 - Metadata list
+                map(Types1_9.METADATA_LIST, transformMetadata); // 7 - Metadata list
             }
         });
 

src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/types/MetaList1_10Type.java

@@ -1,41 +0,0 @@
-package us.myles.ViaVersion.protocols.protocol1_10to1_9_3.types;
-
-import io.netty.buffer.ByteBuf;
-import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
-import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.api.type.types.minecraft.MetaListTypeTemplate;
-import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MetaList1_10Type extends MetaListTypeTemplate {
-
-    @Override
-    public List<Metadata> read(ByteBuf buffer) throws Exception {
-        List<Metadata> list = new ArrayList<>();
-        Metadata meta;
-        do {
-            meta = Protocol1_10To1_9_3_4.METADATA.read(buffer);
-            if (meta != null)
-                list.add(meta);
-        } while (meta != null);
-
-        return list;
-    }
-
-    @Override
-    public void write(ByteBuf buffer, List<Metadata> object) throws Exception {
-        for (Metadata m : object) {
-            if (m.getId() >= 5)
-                m.setId(m.getId() + 1);
-            if (m.getId() == 4)
-                Protocol1_10To1_9_3_4.METADATA.write(buffer, new Metadata(5, NewType.Boolean.getTypeID(), Type.BOOLEAN, false)); // No gravity metadata
-            Protocol1_10To1_9_3_4.METADATA.write(buffer, m);
-        }
-
-        // Write end of list
-        Protocol1_10To1_9_3_4.METADATA.write(buffer, null);
-    }
-}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Chunk1_9_3_4Type.java

@@ -1,54 +0,0 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
-
-import io.netty.buffer.ByteBuf;
-import org.spacehq.opennbt.tag.builtin.CompoundTag;
-import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
-import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.api.type.types.minecraft.BaseChunkType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Chunk1_9_3_4Type extends BaseChunkType {
-    public Chunk1_9_3_4Type() {
-        super("1.9.3 Chunk");
-    }
-
-    @Override
-    public Chunk read(ByteBuf input) throws Exception {
-        int chunkX = input.readInt();
-        int chunkZ = input.readInt();
-
-        boolean groundUp = input.readBoolean();
-        int primaryBitmask = Type.VAR_INT.read(input);
-        int size = Type.VAR_INT.read(input);
-
-        byte[] sections = new byte[size];
-        input.readBytes(sections);
-
-        int blockEntities = Type.VAR_INT.read(input);
-        List<CompoundTag> nbtData = new ArrayList<>();
-        for (int i = 0; i < blockEntities; i++) {
-            nbtData.add(Type.NBT.read(input));
-        }
-        return new Chunk1_9_3_4(chunkX, chunkZ, groundUp, primaryBitmask, new ChunkSection1_9_3_4[] {new ChunkSection1_9_3_4(sections)}, nbtData);
-    }
-
-    @Override
-    public void write(ByteBuf buffer, Chunk input) throws Exception {
-        if (!(input instanceof Chunk1_9_3_4))
-            throw new Exception("Tried to send the wrong chunk type from 1.9.3-4 chunk: " + input.getClass());
-        Chunk1_9_3_4 chunk = (Chunk1_9_3_4) input;
-
-        buffer.writeInt(chunk.getX());
-        buffer.writeInt(chunk.getZ());
-
-        buffer.writeBoolean(chunk.isGroundUp());
-        Type.VAR_INT.write(buffer, chunk.getBitmask());
-
-        Type.VAR_INT.write(buffer, chunk.getSections()[0].getData().length);
-        buffer.writeBytes(chunk.getSections()[0].getData());
-
-        // no block entities as it's earlier
-    }
-}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/ChunkSection1_9_3_4.java

@@ -1,41 +0,0 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
-
-import io.netty.buffer.ByteBuf;
-import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
-
-public class ChunkSection1_9_3_4 implements ChunkSection {
-    private final byte[] data;
-
-    public ChunkSection1_9_3_4(byte[] data) {
-        this.data = data;
-    }
-
-    public byte[] getData() {
-        return data;
-    }
-
-    @Override
-    public int getBlockId(int x, int y, int z) {
-        throw new UnsupportedOperationException("Invalid chunk type!");
-    }
-
-    @Override
-    public void writeBlocks(ByteBuf output) throws Exception {
-        throw new UnsupportedOperationException("Invalid chunk type!");
-    }
-
-    @Override
-    public void writeBlockLight(ByteBuf output) throws Exception {
-        throw new UnsupportedOperationException("Invalid chunk type!");
-    }
-
-    @Override
-    public boolean hasSkyLight() {
-        throw new UnsupportedOperationException("Invalid chunk type!");
-    }
-
-    @Override
-    public void writeSkyLight(ByteBuf output) throws Exception {
-        throw new UnsupportedOperationException("Invalid chunk type!");
-    }
-}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/Protocol1_9_1_2TO1_9_3_4.java

@@ -10,9 +10,11 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.BlockEntity;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 public class Protocol1_9_1_2TO1_9_3_4 extends Protocol {
-    public static Type<Chunk> CHUNK = new Chunk1_9_3_4Type();
 
     @Override
     protected void registerPackets() {
@@ -57,8 +59,50 @@ public class Protocol1_9_1_2TO1_9_3_4 extends Protocol {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        Chunk chunk = wrapper.passthrough(CHUNK);
-                        BlockEntity.handle(((Chunk1_9_3_4) chunk).getBlockEntities(), wrapper.user());
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+
+                        Chunk1_9_3_4Type type = new Chunk1_9_3_4Type(clientWorld);
+                        Chunk chunk = wrapper.passthrough(type);
+
+                        BlockEntity.handle(chunk.getBlockEntities(), wrapper.user());
+                    }
+                });
+            }
+        });
+
+        // Join (save dimension id)
+        registerOutgoing(State.PLAY, 0x23, 0x23, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Entity ID
+                map(Type.UNSIGNED_BYTE); // 1 - Gamemode
+                map(Type.INT); // 2 - Dimension
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientChunks = wrapper.user().get(ClientWorld.class);
+
+                        int dimensionId = wrapper.get(Type.INT, 1);
+                        clientChunks.setEnvironment(dimensionId);
+                    }
+                });
+            }
+        });
+
+        // Respawn (save dimension id)
+        registerOutgoing(State.PLAY, 0x33, 0x33, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Dimension ID
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
+
+                        int dimensionId = wrapper.get(Type.INT, 0);
+                        clientWorld.setEnvironment(dimensionId);
                     }
                 });
             }
@@ -67,6 +111,7 @@ public class Protocol1_9_1_2TO1_9_3_4 extends Protocol {
 
     @Override
     public void init(UserConnection userConnection) {
-
+        if (!userConnection.has(ClientWorld.class))
+            userConnection.put(new ClientWorld(userConnection));
     }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
 
 import lombok.Getter;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
@@ -7,6 +7,7 @@ import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.minecraft.Position;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2TO1_9_3_4;
 
 import java.util.List;
 import java.util.Map;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/Chunk1_9_3_4.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4;
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -15,15 +15,11 @@ public class Chunk1_9_3_4 implements Chunk {
     private boolean groundUp;
     private int bitmask;
     private ChunkSection1_9_3_4[] sections;
-    List<CompoundTag> blockEntities;
+    private byte[] biomeData;
+    private List<CompoundTag> blockEntities;
 
     @Override
     public boolean isBiomeData() {
-        return false;
-    }
-
-    @Override
-    public byte[] getBiomeData() {
-        return new byte[0];
+        return biomeData != null;
     }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java

@@ -0,0 +1,293 @@
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks;
+
+import com.google.common.collect.Lists;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
+import us.myles.ViaVersion.api.minecraft.chunks.NibbleArray;
+import us.myles.ViaVersion.api.type.Type;
+
+import java.util.List;
+
+public class ChunkSection1_9_3_4 implements ChunkSection {
+    /**
+     * Size (dimensions) of blocks in a chunks section.
+     */
+    public static final int SIZE = 16 * 16 * 16; // width * depth * height
+    /**
+     * Length of the sky and block light nibble arrays.
+     */
+    public static final int LIGHT_LENGTH = 16 * 16 * 16 / 2; // size * size * size / 2 (nibble bit count)
+    /**
+     * Length of the block data array.
+     */
+    @Getter
+    private final List<Integer> palette = Lists.newArrayList();
+    private final int[] blocks;
+    private final NibbleArray blockLight;
+    private NibbleArray skyLight;
+
+    public ChunkSection1_9_3_4() {
+        this.blocks = new int[SIZE];
+        this.blockLight = new NibbleArray(SIZE);
+        palette.add(0); // AIR
+    }
+
+    /**
+     * Set a block in the chunks
+     *
+     * @param x    Block X
+     * @param y    Block Y
+     * @param z    Block Z
+     * @param type The type of the block
+     * @param data The data value of the block
+     */
+    public void setBlock(int x, int y, int z, int type, int data) {
+        setBlock(index(x, y, z), type, data);
+    }
+
+    public int getBlockId(int x, int y, int z) {
+        int index = blocks[index(x, y, z)];
+        return palette.get(index) >> 4;
+    }
+
+    /**
+     * Set a block in the chunks based on the index
+     *
+     * @param idx  Index
+     * @param type The type of the block
+     * @param data The data value of the block
+     */
+    public void setBlock(int idx, int type, int data) {
+        int hash = type << 4 | (data & 0xF);
+        int index = palette.indexOf(hash);
+        if (index == -1) {
+            index = palette.size();
+            palette.add(hash);
+        }
+
+        blocks[idx] = index;
+    }
+
+    /**
+     * Set the block light array
+     *
+     * @param data The value to set the block light to
+     */
+    public void setBlockLight(byte[] data) {
+        blockLight.setHandle(data);
+    }
+
+    /**
+     * Set the sky light array
+     *
+     * @param data The value to set the sky light to
+     */
+    public void setSkyLight(byte[] data) {
+        if (data.length != LIGHT_LENGTH) throw new IllegalArgumentException("Data length != " + LIGHT_LENGTH);
+        this.skyLight = new NibbleArray(data);
+    }
+
+    private int index(int x, int y, int z) {
+        return y << 8 | z << 4 | x;
+    }
+
+    /**
+     * Read blocks from input stream.
+     * This reads all the block related data:
+     * <ul>
+     * <li>Block length/palette type</li>
+     * <li>Palette</li>
+     * <li>Block hashes/palette reference</li>
+     * </ul>
+     *
+     * @param input The buffer to read from.
+     * @throws Exception
+     */
+    public void readBlocks(ByteBuf input) throws Exception {
+        palette.clear();
+
+        // Reaad bits per block
+        int bitsPerBlock = input.readUnsignedByte();
+        long maxEntryValue = (1L << bitsPerBlock) - 1;
+
+        if (bitsPerBlock == 0) {
+            bitsPerBlock = 13;
+        }
+        if (bitsPerBlock < 4) {
+            bitsPerBlock = 4;
+        }
+        if (bitsPerBlock > 8) {
+            bitsPerBlock = 13;
+        }
+        int paletteLength = Type.VAR_INT.read(input);
+        // Read palette
+        for (int i = 0; i < paletteLength; i++) {
+            if (bitsPerBlock != 13) {
+                palette.add(Type.VAR_INT.read(input));
+            } else {
+                Type.VAR_INT.read(input);
+            }
+        }
+
+        // Read blocks
+        Long[] blockData = Type.LONG_ARRAY.read(input);
+        if (blockData.length > 0) {
+            for (int i = 0; i < blocks.length; i++) {
+                int bitIndex = i * bitsPerBlock;
+                int startIndex = bitIndex / 64;
+                int endIndex = ((i + 1) * bitsPerBlock - 1) / 64;
+                int startBitSubIndex = bitIndex % 64;
+                int val;
+                if (startIndex == endIndex) {
+                    val = (int) (blockData[startIndex] >>> startBitSubIndex & maxEntryValue);
+                } else {
+                    int endBitSubIndex = 64 - startBitSubIndex;
+                    val = (int) ((blockData[startIndex] >>> startBitSubIndex | blockData[endIndex] << endBitSubIndex) & maxEntryValue);
+                }
+
+                if (bitsPerBlock == 13) {
+                    int type = val >> 4;
+                    int data = val & 0xF;
+
+                    setBlock(i, type, data);
+                } else {
+                    blocks[i] = val;
+                }
+            }
+        }
+    }
+
+    /**
+     * Read block light from buffer.
+     *
+     * @param input The buffer to read from
+     */
+    public void readBlockLight(ByteBuf input) {
+        byte[] handle = new byte[LIGHT_LENGTH];
+        input.readBytes(handle);
+        blockLight.setHandle(handle);
+    }
+
+    /**
+     * Read sky light from buffer.
+     * Note: Only sent in overworld!
+     *
+     * @param input The buffer to read from
+     */
+    public void readSkyLight(ByteBuf input) {
+        byte[] handle = new byte[LIGHT_LENGTH];
+        input.readBytes(handle);
+        if (skyLight != null) {
+            skyLight.setHandle(handle);
+            return;
+        }
+
+        this.skyLight = new NibbleArray(handle);
+    }
+
+    /**
+     * Write the blocks to a buffer.
+     *
+     * @param output The buffer to write to.
+     * @throws Exception Throws if it failed to write.
+     */
+    public void writeBlocks(ByteBuf output) throws Exception {
+        // Write bits per block
+        int bitsPerBlock = 4;
+        while (palette.size() > 1 << bitsPerBlock) {
+            bitsPerBlock += 1;
+        }
+        long maxEntryValue = (1L << bitsPerBlock) - 1;
+        output.writeByte(bitsPerBlock);
+
+        // Write pallet (or not)
+        Type.VAR_INT.write(output, palette.size());
+        for (int mappedId : palette) {
+            Type.VAR_INT.write(output, mappedId);
+        }
+
+        int length = (int) Math.ceil(SIZE * bitsPerBlock / 64.0);
+        Type.VAR_INT.write(output, length);
+        long[] data = new long[length];
+        for (int index = 0; index < blocks.length; index++) {
+            int value = blocks[index];
+            int bitIndex = index * bitsPerBlock;
+            int startIndex = bitIndex / 64;
+            int endIndex = ((index + 1) * bitsPerBlock - 1) / 64;
+            int startBitSubIndex = bitIndex % 64;
+            data[startIndex] = data[startIndex] & ~(maxEntryValue << startBitSubIndex) | ((long) value & maxEntryValue) << startBitSubIndex;
+            if (startIndex != endIndex) {
+                int endBitSubIndex = 64 - startBitSubIndex;
+                data[endIndex] = data[endIndex] >>> endBitSubIndex << endBitSubIndex | ((long) value & maxEntryValue) >> endBitSubIndex;
+            }
+        }
+        for (long l : data) {
+            Type.LONG.write(output, l);
+        }
+    }
+
+    /**
+     * Write the block light to a buffer
+     *
+     * @param output The buffer to write to
+     */
+    public void writeBlockLight(ByteBuf output) {
+        output.writeBytes(blockLight.getHandle());
+    }
+
+    /**
+     * Write the sky light to a buffer
+     *
+     * @param output The buffer to write to
+     */
+    public void writeSkyLight(ByteBuf output) {
+        output.writeBytes(skyLight.getHandle());
+    }
+
+    /**
+     * Check if sky light is present
+     *
+     * @return True if skylight is present
+     */
+    public boolean hasSkyLight() {
+        return skyLight != null;
+    }
+
+    /**
+     * Get expected size of this chunks section.
+     *
+     * @return Amount of bytes sent by this section
+     * @throws Exception If it failed to calculate bits properly
+     */
+    public int getExpectedSize() throws Exception {
+        int bitsPerBlock = palette.size() > 255 ? 16 : 8;
+        int bytes = 1; // bits per block
+        bytes += paletteBytes(); // palette
+        bytes += countBytes(bitsPerBlock == 16 ? SIZE * 2 : SIZE); // block data length
+        bytes += (palette.size() > 255 ? 2 : 1) * SIZE; // block data
+        bytes += LIGHT_LENGTH; // block light
+        bytes += hasSkyLight() ? LIGHT_LENGTH : 0; // sky light
+        return bytes;
+    }
+
+    private int paletteBytes() throws Exception {
+        // Count bytes used by pallet
+        int bytes = countBytes(palette.size());
+        for (int mappedId : palette) {
+            bytes += countBytes(mappedId);
+        }
+        return bytes;
+    }
+
+    private int countBytes(int value) throws Exception {
+        // Count amount of bytes that would be sent if the value were sent as a VarInt
+        ByteBuf buf = Unpooled.buffer();
+        Type.VAR_INT.write(buf, value);
+        buf.readerIndex(0);
+        int bitCount = buf.readableBytes();
+        buf.release();
+        return bitCount;
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/types/Chunk1_9_3_4Type.java

@@ -0,0 +1,102 @@
+package us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.types;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.bukkit.World;
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
+import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
+import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
+import us.myles.ViaVersion.api.type.PartialType;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.minecraft.BaseChunkType;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.Chunk1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.chunks.ChunkSection1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.List;
+
+public class Chunk1_9_3_4Type extends PartialType<Chunk, ClientWorld> {
+
+    public Chunk1_9_3_4Type(ClientWorld param) {
+        super(param, Chunk.class);
+    }
+
+    @Override
+    public Chunk read(ByteBuf input, ClientWorld world) throws Exception {
+        int chunkX = input.readInt();
+        int chunkZ = input.readInt();
+
+        boolean groundUp = input.readBoolean();
+        int primaryBitmask = Type.VAR_INT.read(input);
+        Type.VAR_INT.read(input);
+
+        BitSet usedSections = new BitSet(16);
+        ChunkSection1_9_3_4[] sections = new ChunkSection1_9_3_4[16];
+        // Calculate section count from bitmask
+        for (int i = 0; i < 16; i++) {
+            if ((primaryBitmask & (1 << i)) != 0) {
+                usedSections.set(i);
+            }
+        }
+
+        // Read sections
+        for (int i = 0; i < 16; i++) {
+            if (!usedSections.get(i)) continue; // Section not set
+            ChunkSection1_9_3_4 section = new ChunkSection1_9_3_4();
+            sections[i] = section;
+            section.readBlocks(input);
+            section.readBlockLight(input);
+            if (world.getEnvironment() == World.Environment.NORMAL) {
+                section.readSkyLight(input);
+            }
+        }
+
+        byte[] biomeData = groundUp ? new byte[256] : null;
+        if (groundUp) {
+            input.readBytes(biomeData);
+        }
+
+        List<CompoundTag> nbtData = Arrays.asList(Type.NBT_ARRAY.read(input));
+
+        return new Chunk1_9_3_4(chunkX, chunkZ, groundUp, primaryBitmask, sections, biomeData, nbtData);
+    }
+
+    @Override
+    public void write(ByteBuf output, ClientWorld world, Chunk chunk) throws Exception {
+        output.writeInt(chunk.getX());
+        output.writeInt(chunk.getZ());
+
+        output.writeBoolean(chunk.isGroundUp());
+        Type.VAR_INT.write(output, chunk.getBitmask());
+
+        ByteBuf buf = Unpooled.buffer();
+        for (int i = 0; i < 16; i++) {
+            ChunkSection section = chunk.getSections()[i];
+            if (section == null) continue; // Section not set
+            section.writeBlocks(buf);
+            section.writeBlockLight(buf);
+
+            if (!section.hasSkyLight()) continue; // No sky light, we're done here.
+            section.writeSkyLight(buf);
+
+        }
+        buf.readerIndex(0);
+        Type.VAR_INT.write(output, buf.readableBytes() + (chunk.isBiomeData() ? 256 : 0));
+        output.writeBytes(buf);
+        buf.release(); // release buffer
+
+        // Write biome data
+        if (chunk.isBiomeData()) {
+            output.writeBytes(chunk.getBiomeData());
+        }
+
+        // Don't write block entities
+    }
+
+    @Override
+    public Class<? extends Type> getBaseClass() {
+        return BaseChunkType.class;
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java

@@ -13,7 +13,9 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.FakeTileEntity;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.types.Chunk1_9_1_2Type;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -140,6 +142,7 @@ public class Protocol1_9_3TO1_9_1_2 extends Protocol {
 
     @Override
     public void init(UserConnection user) {
-        user.put(new ClientWorld(user));
+        if (!user.has(ClientWorld.class))
+            user.put(new ClientWorld(user));
     }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/Chunk1_9_1_2.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
+package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
+package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks;
 
 import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
+package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks;
 
 import org.bukkit.Material;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java

@@ -26,7 +26,8 @@ public class ClientWorld extends StoredObject {
             case 1:
                 return World.Environment.THE_END;
             default:
-                throw new IllegalArgumentException("Invalid environment id:" + id);
+                return World.Environment.NETHER;
+                //throw new IllegalArgumentException("Invalid environment id:" + id);
         }
     }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
+package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.types;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -12,6 +12,8 @@ import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.api.type.types.minecraft.BaseChunkType;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.Chunk1_9_1_2;
+import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.chunks.ChunkSection1_9_1_2;
 import us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 import java.util.ArrayList;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java

@@ -13,12 +13,12 @@ import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.protocol.Protocol;
 import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Metadata1_8Type;
+import us.myles.ViaVersion.api.type.types.version.MetadataList1_8Type;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.*;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.packets.*;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.*;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.MetadataListType;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.MetadataType;
 
 import java.util.List;
 import java.util.UUID;
@@ -26,8 +26,11 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
 public class Protocol1_9TO1_8 extends Protocol {
-    public static Type<List<Metadata>> METADATA_LIST = new MetadataListType();
-    public static Type<Metadata> METADATA = new MetadataType();
+    @Deprecated
+    public static Type<List<Metadata>> METADATA_LIST = new MetadataList1_8Type();
+    @Deprecated
+    public static Type<Metadata> METADATA = new Metadata1_8Type();
+
     private static Gson gson = new GsonBuilder().create();
     public static ValueTransformer<String, String> FIX_JSON = new ValueTransformer<String, String>(Type.STRING) {
         @Override
@@ -102,13 +105,15 @@ public class Protocol1_9TO1_8 extends Protocol {
     @Override
     protected void registerListeners() {
         ViaVersionPlugin plugin = (ViaVersionPlugin) Bukkit.getPluginManager().getPlugin("ViaVersion");
-        Bukkit.getPluginManager().registerEvents(new ArmorListener(plugin), plugin);
-        Bukkit.getPluginManager().registerEvents(new CommandBlockListener(plugin), plugin);
-        Bukkit.getPluginManager().registerEvents(new DeathListener(plugin), plugin);
-        Bukkit.getPluginManager().registerEvents(new BlockListener(plugin), plugin);
+
+        new ArmorListener(plugin).register();
+        new CommandBlockListener(plugin).register();
+        new DeathListener(plugin).register();
+        new BlockListener(plugin).register();
+
         if (Bukkit.getVersion().toLowerCase().contains("paper") || Bukkit.getVersion().toLowerCase().contains("taco")) {
             plugin.getLogger().info("Enabling PaperSpigot/TacoSpigot patch: Fixes block placement.");
-            Bukkit.getPluginManager().registerEvents(new PaperPatch(), plugin);
+            new PaperPatch(plugin).register();
         }
         if (plugin.getConf().isStimulatePlayerTick())
             new ViaIdleThread(plugin.getPortedPlayers()).runTaskTimer(plugin, 1L, 1L); // Updates player's idle status

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/Chunk1_9to1_8.java

@@ -3,8 +3,12 @@ package us.myles.ViaVersion.protocols.protocol1_9to1_8.chunks;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 
+import java.util.Collections;
+import java.util.List;
+
 @RequiredArgsConstructor
 @Getter
 @ToString
@@ -46,4 +50,9 @@ public class Chunk1_9to1_8 implements Chunk {
     public int getBitmask() {
         return primaryBitmask;
     }
+
+    @Override
+    public List<CompoundTag> getBlockEntities() {
+        return Collections.emptyList();
+    }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/ArmorListener.java

@@ -1,12 +1,10 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 
-import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
@@ -16,30 +14,28 @@ import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.CraftingInventory;
 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.ViaListener;
 import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ArmorType;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
 import java.util.UUID;
 
-@RequiredArgsConstructor
-public class ArmorListener implements Listener {
+public class ArmorListener extends ViaListener {
 
     private static final UUID ARMOR_ATTRIBUTE = UUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150");
-    private final ViaVersionPlugin plugin;
 
-    public static void sendArmorUpdate(Player player) {
+    public ArmorListener(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
+
+    public void sendArmorUpdate(Player player) {
         // Ensure that the player is on our pipe
-        UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(player);
-        if (userConnection == null) return;
-        if (!userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
+        if (!isOnPipe(player)) return;
 
         int armor = ArmorType.calculateArmorPoints(player.getInventory().getArmorContents());
 
-        PacketWrapper wrapper = new PacketWrapper(0x4B, null, userConnection);
+        PacketWrapper wrapper = new PacketWrapper(0x4B, null, getUserConnection(player));
         try {
             wrapper.write(Type.VAR_INT, player.getEntityId()); // Player ID
             wrapper.write(Type.INT, 1); // only 1 property
@@ -61,17 +57,15 @@ public class ArmorListener implements Listener {
         HumanEntity human = e.getWhoClicked();
         if (human instanceof Player && e.getInventory() instanceof CraftingInventory) {
             final Player player = (Player) human;
-            if (ViaVersion.getInstance().isPorted(player)) {
-                if (e.getCurrentItem() != null) {
-                    if (ArmorType.isArmor(e.getCurrentItem().getType())) {
-                        sendDelayedArmorUpdate(player);
-                        return;
-                    }
-                }
-                if (e.getRawSlot() >= 5 && e.getRawSlot() <= 8) {
+            if (e.getCurrentItem() != null) {
+                if (ArmorType.isArmor(e.getCurrentItem().getType())) {
                     sendDelayedArmorUpdate(player);
+                    return;
                 }
             }
+            if (e.getRawSlot() >= 5 && e.getRawSlot() <= 8) {
+                sendDelayedArmorUpdate(player);
+            }
         }
     }
 
@@ -81,12 +75,10 @@ public class ArmorListener implements Listener {
             if (e.getAction() == Action.RIGHT_CLICK_AIR || e.getAction() == Action.RIGHT_CLICK_BLOCK) {
                 final Player player = e.getPlayer();
                 // Due to odd bugs it's 3 ticks later
-                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+                Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() {
                     @Override
                     public void run() {
-                        if (ViaVersion.getInstance().isPorted(player)) {
-                            sendArmorUpdate(player);
-                        }
+                        sendArmorUpdate(player);
                     }
                 }, 3L);
             }
@@ -100,23 +92,20 @@ public class ArmorListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onRespawn(PlayerRespawnEvent e) {
-        if (ViaVersion.getInstance().isPorted(e.getPlayer()))
-            sendDelayedArmorUpdate(e.getPlayer());
+        sendDelayedArmorUpdate(e.getPlayer());
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onWorldChange(PlayerChangedWorldEvent e) {
-        if (ViaVersion.getInstance().isPorted(e.getPlayer()))
-            sendArmorUpdate(e.getPlayer());
+        sendArmorUpdate(e.getPlayer());
     }
 
     public void sendDelayedArmorUpdate(final Player player) {
-        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+        if (!isOnPipe(player)) return; // Don't start a task if the player is not on the pipe
+        Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() {
             @Override
             public void run() {
-                if (ViaVersion.getInstance().isPorted(player)) {
-                    sendArmorUpdate(player);
-                }
+                sendArmorUpdate(player);
             }
         });
     }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/BlockListener.java

@@ -1,30 +1,28 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 
-import lombok.RequiredArgsConstructor;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import us.myles.ViaVersion.ViaVersionPlugin;
-import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.ViaListener;
 import us.myles.ViaVersion.api.minecraft.Position;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
 
-@RequiredArgsConstructor
-public class BlockListener implements Listener {
+public class BlockListener extends ViaListener {
 
-    private final ViaVersionPlugin plugin;
+    public BlockListener(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void placeBlock(BlockPlaceEvent e) {
-        if (plugin.isPorted(e.getPlayer())) {
-            UserConnection c = plugin.getConnection(e.getPlayer());
-            if (!c.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
+        if (isOnPipe(e.getPlayer())) {
             Block b = e.getBlockPlaced();
-            plugin.getConnection(e.getPlayer()).get(EntityTracker.class).addBlockInteraction(new Position((long) b.getX(), (long) b.getY(), (long) b.getZ()));
+            getUserConnection(e.getPlayer())
+                    .get(EntityTracker.class)
+                    .addBlockInteraction(new Position((long) b.getX(), (long) b.getY(), (long) b.getZ()));
         }
     }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/CommandBlockListener.java

@@ -3,14 +3,12 @@ package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
 import io.netty.buffer.Unpooled;
-import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.block.CommandBlock;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -20,11 +18,10 @@ import org.spacehq.opennbt.tag.builtin.ByteTag;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.PacketWrapper;
-import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.ViaListener;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.minecraft.Position;
 import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
@@ -32,10 +29,11 @@ import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.lang.reflect.Method;
 
-@RequiredArgsConstructor
-public class CommandBlockListener implements Listener {
+public class CommandBlockListener extends ViaListener {
 
-    private final ViaVersionPlugin plugin;
+    public CommandBlockListener(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onJoin(PlayerJoinEvent e) {
@@ -44,7 +42,9 @@ public class CommandBlockListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onRespawn(final PlayerRespawnEvent e) {
-        Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
+        if (!isOnPipe(e.getPlayer())) return;
+
+        Bukkit.getScheduler().runTaskLater(getPlugin(), new Runnable() {
             @Override
             public void run() {
                 sendOp(e.getPlayer());
@@ -59,12 +59,7 @@ public class CommandBlockListener implements Listener {
 
     @EventHandler(ignoreCancelled = true)
     public void onInteract(PlayerInteractEvent e) {
-        if (e.getAction() == Action.RIGHT_CLICK_BLOCK && plugin.isPorted(e.getPlayer()) && e.getPlayer().isOp()) {
-            // Ensure that the player is on our pipe
-            UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(e.getPlayer());
-            if (userConnection == null) return;
-            if (!userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
-
+        if (e.getAction() == Action.RIGHT_CLICK_BLOCK && isOnPipe(e.getPlayer()) && e.getPlayer().isOp()) {
             try {
                 sendCommandBlockPacket(e.getClickedBlock(), e.getPlayer());
             } catch (Exception ex) {
@@ -74,16 +69,13 @@ public class CommandBlockListener implements Listener {
     }
 
     private void sendOp(Player p) {
-        if (p.isOp() && plugin.isPorted(p)) {
-            // Ensure that the player is on our pipe
-            UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(p);
-            if (userConnection == null) return;
-            if (!userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
-
+        if (p.isOp() && isOnPipe(p)) {
             try {
-                PacketWrapper wrapper = new PacketWrapper(0x1B, null, userConnection); // Entity status
-                wrapper.write(Type.INT, p.getEntityId());
+                PacketWrapper wrapper = new PacketWrapper(0x1B, null, getUserConnection(p)); // Entity status
+
+                wrapper.write(Type.INT, p.getEntityId()); // Entity ID
                 wrapper.write(Type.BYTE, (byte) 26); //Hardcoded op permission level
+
                 wrapper.send(Protocol1_9TO1_8.class);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -99,9 +91,7 @@ public class CommandBlockListener implements Listener {
         Object tileEntityCommand = ReflectionUtil.get(cmd, "commandBlock", ReflectionUtil.nms("TileEntityCommand"));
         Object updatePacket = ReflectionUtil.invoke(tileEntityCommand, "getUpdatePacket");
 
-        UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(player);
-
-        PacketWrapper wrapper = generatePacket(updatePacket, userConnection);
+        PacketWrapper wrapper = generatePacket(updatePacket, getUserConnection(player));
         wrapper.send(Protocol1_9TO1_8.class);
     }
 

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/DeathListener.java

@@ -1,40 +1,28 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 
-import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.ViaListener;
 import us.myles.ViaVersion.api.ViaVersion;
-import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.type.Type;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
-@RequiredArgsConstructor
-public class DeathListener implements Listener {
-    private final ViaVersionPlugin plugin;
+public class DeathListener extends ViaListener {
+    public DeathListener(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
     public void onDeath(PlayerDeathEvent e) {
         Player p = e.getEntity();
-        if (ViaVersion.getConfig().isShowNewDeathMessages() && checkGamerule(p.getWorld()) && e.getDeathMessage() != null && checkPipeline(p)) {
+        if (isOnPipe(p) && ViaVersion.getConfig().isShowNewDeathMessages() && checkGamerule(p.getWorld()) && e.getDeathMessage() != null)
             sendPacket(p, e.getDeathMessage());
-        }
-    }
-
-    public boolean checkPipeline(Player p) {
-        UserConnection userConnection = plugin.getConnection(p);
-        return userConnection != null && userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class);
-    }
-
-    private UserConnection getUserConnection(Player p) {
-        return plugin.getConnection(p);
     }
 
     public boolean checkGamerule(World w) {
@@ -46,19 +34,19 @@ public class DeathListener implements Listener {
     }
 
     private void sendPacket(final Player p, final String msg) {
-        Bukkit.getScheduler().runTask(plugin, new Runnable() {
+        Bukkit.getScheduler().runTask(getPlugin(), new Runnable() {
             @Override
             public void run() {
                 PacketWrapper wrapper = new PacketWrapper(0x2C, null, getUserConnection(p));
                 try {
-                    wrapper.write(Type.VAR_INT, 2);
-                    wrapper.write(Type.VAR_INT, p.getEntityId());
-                    wrapper.write(Type.INT, p.getEntityId());
-                    Protocol1_9TO1_8.FIX_JSON.write(wrapper, msg);
+                    wrapper.write(Type.VAR_INT, 2); // Event - Entity dead
+                    wrapper.write(Type.VAR_INT, p.getEntityId()); // Player ID
+                    wrapper.write(Type.INT, p.getEntityId()); // Entity ID
+                    Protocol1_9TO1_8.FIX_JSON.write(wrapper, msg); // Message
+
                     wrapper.send(Protocol1_9TO1_8.class);
                 } catch (Exception e) {
                     e.printStackTrace();
-                    wrapper.clearInputBuffer();
                 }
             }
         });

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/PaperPatch.java

@@ -1,32 +1,35 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 
 import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import us.myles.ViaVersion.ViaVersionPlugin;
-import us.myles.ViaVersion.api.ViaVersion;
-import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+import us.myles.ViaVersion.api.ViaListener;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
-public class PaperPatch implements Listener {
+public class PaperPatch extends ViaListener {
+
+    public PaperPatch(ViaVersionPlugin plugin) {
+        super(plugin, Protocol1_9TO1_8.class);
+    }
 
     /*
     This patch is applied when Paper is detected.
     I'm unsure of what causes this but essentially,
-    placing blocks where your standing works?
+    placing blocks where you're standing works?
     If there is a better fix then we'll replace this.
      */
 
     @EventHandler(ignoreCancelled = true)
     public void onPlace(BlockPlaceEvent e) {
-        if (ViaVersion.getInstance().isPorted(e.getPlayer())) {
-            UserConnection userConnection = ((ViaVersionPlugin) ViaVersion.getInstance()).getConnection(e.getPlayer());
-            if (userConnection == null) return;
-            if (!userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
+        if (isOnPipe(e.getPlayer())) {
             Location diff = e.getPlayer().getLocation().subtract(e.getBlock().getLocation().add(0.5D, 0, 0.5D));
+            Material block = e.getBlockPlaced().getType();
+            if (!block.isSolid()) {
+                return;
+            }
             if (e.getPlayer().getLocation().getBlock().equals(e.getBlock())) {
                 e.setCancelled(true);
             } else {

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java

@@ -10,6 +10,8 @@ import us.myles.ViaVersion.api.remapper.PacketHandler;
 import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_8;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
@@ -175,11 +177,11 @@ public class EntityPackets {
             @Override
             public void registerMap() {
                 map(Type.VAR_INT); // 0 - Entity ID
-                map(Protocol1_9TO1_8.METADATA_LIST); // 1 - Metadata List
+                map(Types1_8.METADATA_LIST, Types1_9.METADATA_LIST); // 1 - Metadata List
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         if (tracker.getClientEntityTypes().containsKey(entityID)) {
@@ -196,7 +198,7 @@ public class EntityPackets {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         tracker.handleMetadata(entityID, metadataList);
@@ -207,7 +209,7 @@ public class EntityPackets {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         if (metadataList.size() == 0) {
                             wrapper.cancel();
                         }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java

@@ -11,6 +11,8 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.remapper.ValueCreator;
 import us.myles.ViaVersion.api.remapper.ValueTransformer;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_8;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
@@ -107,7 +109,7 @@ public class SpawnPackets {
                                     // TEMP FIX FOR POTIONS UNTIL WE FIGURE OUT HOW TO TRANSFORM SENT PACKETS
                                     Metadata potion = new Metadata(5, NewType.Slot.getTypeID(), Type.ITEM, item);
                                     meta.add(potion);
-                                    wrapper.write(Protocol1_9TO1_8.METADATA_LIST, meta);
+                                    wrapper.write(Types1_9.METADATA_LIST, meta);
                                 }
                             });
                             metaPacket.send(Protocol1_9TO1_8.class);
@@ -206,11 +208,11 @@ public class SpawnPackets {
                 map(Type.SHORT); // 10 - Velocity Y
                 map(Type.SHORT); // 11 - Velocity Z
 
-                map(Protocol1_9TO1_8.METADATA_LIST);
+                map(Types1_8.METADATA_LIST, Types1_9.METADATA_LIST);
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         if (tracker.getClientEntityTypes().containsKey(entityID)) {
@@ -225,7 +227,7 @@ public class SpawnPackets {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         tracker.handleMetadata(entityID, metadataList);
@@ -311,12 +313,12 @@ public class SpawnPackets {
                     }
                 });
 
-                map(Protocol1_9TO1_8.METADATA_LIST);
+                map(Types1_8.METADATA_LIST, Types1_9.METADATA_LIST);
 
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         if (tracker.getClientEntityTypes().containsKey(entityID)) {
@@ -332,7 +334,7 @@ public class SpawnPackets {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        List<Metadata> metadataList = wrapper.get(Types1_9.METADATA_LIST, 0);
                         int entityID = wrapper.get(Type.VAR_INT, 0);
                         EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                         tracker.handleMetadata(entityID, metadataList);

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundEffect.java

@@ -35,7 +35,7 @@ public enum SoundEffect {
     MOB_HORSE_ZOMBIE_DEATH("mob.horse.zombie.death", "entity.zombie_horse.death", SoundCategory.NEUTRAL),
     MOB_SILVERFISH_KILL("mob.silverfish.kill", "entity.endermite.death", SoundCategory.HOSTILE),
     MOB_WOLF_PANTING("mob.wolf.panting", "entity.wolf.pant", SoundCategory.NEUTRAL),
-    NOTE_BASS("note.bass", "null", SoundCategory.RECORD),
+    NOTE_BASS("note.bass", "block.note.bass", SoundCategory.RECORD),
     DIG_STONE("dig.stone", "block.glass.place", SoundCategory.BLOCK),
     MOB_ENDERMEN_STARE("mob.endermen.stare", "entity.endermen.stare", SoundCategory.HOSTILE),
     GAME_PLAYER_SWIM_SPLASH("game.player.swim.splash", "entity.generic.splash", SoundCategory.BLOCK),
@@ -79,7 +79,7 @@ public enum SoundEffect {
     CREEPER_PRIMED("creeper.primed", "entity.creeper.primed", SoundCategory.HOSTILE),
     DIG_SAND("dig.sand", "block.sand.break", SoundCategory.BLOCK),
     MOB_CHICKEN_SAY("mob.chicken.say", "entity.chicken.ambient", SoundCategory.NEUTRAL),
-    RANDOM_DOOR_CLOSE("random.door_close", "null", SoundCategory.BLOCK),
+    RANDOM_DOOR_CLOSE("random.door_close", "block.wooden_door.close", SoundCategory.BLOCK),
     MOB_GUARDIAN_ELDER_DEATH("mob.guardian.elder.death", "entity.elder_guardian.death", SoundCategory.HOSTILE),
     FIREWORKS_TWINKLE("fireworks.twinkle", "entity.firework.twinkle", SoundCategory.AMBIENT),
     MOB_HORSE_SKELETON_DEATH("mob.horse.skeleton.death", "entity.skeleton_horse.death", SoundCategory.NEUTRAL),
@@ -177,7 +177,7 @@ public enum SoundEffect {
     GAME_TNT_PRIMED("game.tnt.primed", "entity.creeper.primed", SoundCategory.BLOCK),
     MOB_SHEEP_STEP("mob.sheep.step", "entity.sheep.step", SoundCategory.NEUTRAL),
     MOB_ZOMBIE_DEATH("mob.zombie.death", "entity.zombie.death", SoundCategory.HOSTILE),
-    RANDOM_DOOR_OPEN("random.door_open", "null", SoundCategory.BLOCK),
+    RANDOM_DOOR_OPEN("random.door_open", "block.wooden_door.open", SoundCategory.BLOCK),
     MOB_ENDERMEN_PORTAL("mob.endermen.portal", "entity.endermen.teleport", SoundCategory.HOSTILE),
     MOB_HORSE_ANGRY("mob.horse.angry", "entity.horse.angry", SoundCategory.NEUTRAL),
     MOB_WOLF_GROWL("mob.wolf.growl", "entity.wolf.growl", SoundCategory.NEUTRAL),
@@ -242,7 +242,7 @@ public enum SoundEffect {
     MOB_RABBIT_IDLE("mob.rabbit.idle", "entity.rabbit.ambient", SoundCategory.NEUTRAL),
     MUSIC_GAME_END("music.game.end", "music.end", SoundCategory.MUSIC),
     MUSIC_GAME("music.game", "music.game", SoundCategory.MUSIC),
-    MOB_GUARDIAN_IDLE("mob.guardian.idle", "null", SoundCategory.HOSTILE),
+    MOB_GUARDIAN_IDLE("mob.guardian.idle", "entity.elder_guardian.ambient", SoundCategory.HOSTILE),
     RECORDS_WARD("records.ward", "record.ward", SoundCategory.RECORD),
     RECORDS_13("records.13", "record.13", SoundCategory.RECORD),
     MOB_RABBIT_HOP("mob.rabbit.hop", "entity.rabbit.jump", SoundCategory.NEUTRAL),

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java

@@ -19,6 +19,7 @@ import us.myles.ViaVersion.api.minecraft.Position;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_9;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.chat.GameMode;
@@ -274,7 +275,7 @@ public class EntityTracker extends StoredObject {
         if (metadataBuffer.containsKey(entityID)) {
             PacketWrapper wrapper = new PacketWrapper(0x39, null, getUser());
             wrapper.write(Type.VAR_INT, entityID);
-            wrapper.write(Protocol1_9TO1_8.METADATA_LIST, metadataBuffer.get(entityID));
+            wrapper.write(Types1_9.METADATA_LIST, metadataBuffer.get(entityID));
             MetadataRewriter.transform(getClientEntityTypes().get(entityID), metadataBuffer.get(entityID));
             handleMetadata(entityID, metadataBuffer.get(entityID));
             if (metadataBuffer.get(entityID).size() > 0) {

src/main/java/us/myles/ViaVersion/update/UpdateUtil.java

@@ -21,8 +21,9 @@ import java.util.UUID;
 public class UpdateUtil {
 
     public final static String PREFIX = ChatColor.GREEN + "" + ChatColor.BOLD + "[ViaVersion] " + ChatColor.GREEN;
-    private final static String URL = "http://api.spiget.org/v1/resources/";
+    private final static String URL = "http://api.spiget.org/v2/resources/";
     private final static int PLUGIN = 19254;
+    private final static String LATEST_VERSION = "/versions/latest";
 
     public static void sendUpdateMessage(final UUID uuid, final Plugin plugin) {
         new BukkitRunnable() {
@@ -81,20 +82,24 @@ public class UpdateUtil {
         try {
             current = new Version(ViaVersion.getInstance().getVersion());
         } catch (IllegalArgumentException e) {
-            return "You are using a debug/custom version, consider updating.";
+            return "You are using a custom version, consider updating.";
         }
         Version newest = new Version(newestString);
         if (current.compareTo(newest) < 0)
-            return "There is a newer version available: " + newest.toString();
+            return "There is a newer version available: " + newest.toString() + ", you're on: " + current.toString();
         else if (console && current.compareTo(newest) != 0) {
-            return "You are running a newer version than is released!";
+            if (current.getTag().toLowerCase().startsWith("dev") || current.getTag().toLowerCase().startsWith("snapshot")) {
+                return "You are running a development version, please report any bugs to GitHub.";
+            } else {
+                return "You are running a newer version than is released!";
+            }
         }
         return null;
     }
 
     private static String getNewestVersion() {
         try {
-            URL url = new URL(URL + PLUGIN + "?" + System.currentTimeMillis());
+            URL url = new URL(URL + PLUGIN + LATEST_VERSION + "?" + System.currentTimeMillis());
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setUseCaches(true);
             connection.addRequestProperty("User-Agent", "ViaVersion " + ViaVersion.getInstance().getVersion());
@@ -114,7 +119,7 @@ public class UpdateUtil {
                 e.printStackTrace();
                 return null;
             }
-            return (String) statistics.get("version");
+            return (String) statistics.get("name");
         } catch (MalformedURLException e) {
             return null;
         } catch (IOException e) {

src/main/java/us/myles/ViaVersion/update/Version.java

@@ -2,21 +2,26 @@ package us.myles.ViaVersion.update;
 
 import org.apache.commons.lang.StringUtils;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class Version implements Comparable<Version> {
-    private int[] parts;
+    private static Pattern semVer = Pattern.compile("(?<a>0|[1-9]\\d*)\\.(?<b>0|[1-9]\\d*)(?:\\.(?<c>0|[1-9]\\d*))?(?:-(?<tag>[A-z0-9.-]*))?");
+    private int[] parts = new int[3];
+    private String tag;
 
     public Version(String value) {
         if (value == null)
             throw new IllegalArgumentException("Version can not be null");
 
-        if (!value.matches("^[0-9]+(\\.[0-9]+)*$"))
+        Matcher matcher = semVer.matcher(value);
+        if (!matcher.matches())
             throw new IllegalArgumentException("Invalid version format");
+        parts[0] = Integer.parseInt(matcher.group("a"));
+        parts[1] = Integer.parseInt(matcher.group("b"));
+        parts[2] = matcher.group("c") == null ? 0 : Integer.parseInt(matcher.group("c"));
 
-        String[] split = value.split("\\.");
-        parts = new int[split.length];
-
-        for (int i = 0; i < split.length; i += 1)
-            parts[i] = Integer.parseInt(split[i]);
+        tag = matcher.group("tag") == null ? "" : matcher.group("tag");
     }
 
     public static int compare(Version verA, Version verB) {
@@ -33,6 +38,12 @@ public class Version implements Comparable<Version> {
             if (partA > partB) return 1;
         }
 
+        // Simple tag check
+        if (verA.tag.length() == 0 && verB.tag.length() > 0)
+            return 1;
+        if (verA.tag.length() > 0 && verB.tag.length() == 0)
+            return -1;
+
         return 0;
     }
 
@@ -47,7 +58,7 @@ public class Version implements Comparable<Version> {
         for (int i = 0; i < parts.length; i += 1)
             split[i] = String.valueOf(parts[i]);
 
-        return StringUtils.join(split, ".");
+        return StringUtils.join(split, ".") + (tag.length() != 0 ? "-" + tag : "");
     }
 
     @Override
@@ -59,4 +70,8 @@ public class Version implements Comparable<Version> {
     public boolean equals(Object that) {
         return that instanceof Version && equals(this, (Version) that);
     }
+
+    public String getTag() {
+        return tag;
+    }
 }

src/main/resources/config.yml

@@ -17,6 +17,10 @@ send-supported-versions: false
 block-protocols: []
 # Change the blocked disconnect message
 block-disconnect-msg: "You are using an unsupported Minecraft version!"
+# If you use ProtocolLib, we can't reload without kicking the players.
+# (We don't suggest using reload either, use a plugin manager)
+# You can customise the message we kick people with if you use ProtocolLib here.
+reload-disconnect-msg: "Server reload, please rejoin!"
 #
 #----------------------------------------------------------#
 #                  GLOBAL PACKET LIMITER                    #

src/main/resources/plugin.yml

@@ -3,8 +3,8 @@ main: us.myles.ViaVersion.ViaVersionPlugin
 author: _MylesC
 version: ${project.version}
 load: postworld
-loadbefore: [ProtocolLib, ProxyPipe, SpigotLib, PacketListenerApi, SkinRestorer]
-softdepend: [ProtocolSupport]
+loadbefore: [ProtocolLib, ProxyPipe, SpigotLib, SkinRestorer]
+softdepend: [ProtocolSupport, PacketListenerApi]
 commands:
   viaversion:
     description: Shows ViaVersion Version and more.