Pom pom

Make BossBar API easier to use

README.md

@@ -1,59 +1,10 @@
-# ViaVersion 0.6.0
-[![Build Status](https://travis-ci.org/MylesIsCool/ViaVersion.svg?branch=master)](https://travis-ci.org/MylesIsCool/ViaVersion)
-**Allows the connection of 1.9 clients to 1.8**
-
-This plugin modifies netty to allow connection of 1.9 clients to 1.8,
-
-###*Don't use late bind*
+# ViaVersion API Dev
 
 
-This took hours of work, so if you enjoy this consider looking into contacting me and supporting my projects.
+This is an experimental branch, but soon to be live.
 
-**Contributor Chat:** https://gitter.im/MylesIsCool/ViaVersion
-
-
-Sources:
---------
-
-**wiki.vg** (Protocol info, though I did have to find a lot myself)
-
-**MCProtocolLib** (used for chunk reading & some of writing.)
-
-**OpenNBT** (used for slot rewriting)
-
-
-
-Contributors:
---------
-
-**Myself** (harhar)
-
-**Matsv/StamBoom**
-
-**HugoDaBosss**
-
-**SanderGielisse**
-
-**Paulomart**
-
-**gigosaurus**
-
-**fillefilip8**
-
-
-
-Releases / Dev Builds:
---------
-You can find official releases here:
-
-https://www.spigotmc.org/resources/viaversion.19254/history
-
-
-----------
-
-You can find unofficial dev builds here:
-
-**fillefilip8's Build Server:** http://build.fillecraft.com:8080/job/ViaVersion
+(The only issues would be really really complex protocol pipelines...) 
+(But I don't see them happening any time soon)
 
 License:
 --------

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion</artifactId>
-    <version>0.6.2-SNAPSHOT</version>
+    <version>0.7.0</version>
     <packaging>jar</packaging>
 
     <name>ViaVersion</name>
@@ -101,6 +101,10 @@
                             <pattern>org.spacehq.opennbt</pattern>
                             <shadedPattern>us.myles.viaversion.libs.opennbt</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>com.google.gson</pattern>
+                            <shadedPattern>us.myles.viaversion.libs.gson</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
@@ -162,6 +166,15 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- GSON (JSON Library) -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.6.2</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Netty (Network Library) -->
         <dependency>
             <groupId>io.netty</groupId>
@@ -170,6 +183,7 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+
         <!-- Lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>

src/main/java/org/spacehq/mc/protocol/data/game/chunk/BlockStorage.java

@@ -1,126 +0,0 @@
-package org.spacehq.mc.protocol.data.game.chunk;
-
-import io.netty.buffer.ByteBuf;
-import us.myles.ViaVersion.util.PacketUtil;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class BlockStorage {
-    private int bitsPerEntry;
-
-    private List<Integer> states;
-    private FlexibleStorage storage;
-
-    public BlockStorage() {
-        this.bitsPerEntry = 4;
-
-        this.states = new ArrayList<>();
-        this.states.add(0);
-
-        this.storage = new FlexibleStorage(this.bitsPerEntry, 4096);
-    }
-
-    public BlockStorage(ByteBuf in) throws IOException {
-        this.bitsPerEntry = in.readUnsignedByte();
-
-        this.states = new ArrayList<>();
-        int stateCount = PacketUtil.readVarInt(in);
-        for (int i = 0; i < stateCount; i++) {
-            this.states.add(PacketUtil.readVarInt(in));
-        }
-
-        this.storage = new FlexibleStorage(this.bitsPerEntry, PacketUtil.readLongs(PacketUtil.readVarInt(in), in));
-    }
-
-    private static int index(int x, int y, int z) {
-        return y << 8 | z << 4 | x;
-    }
-
-    public void write(ByteBuf out) throws IOException {
-        out.writeByte(this.bitsPerEntry);
-
-        PacketUtil.writeVarInt(this.states.size(), out);
-        for (int state : this.states) {
-            PacketUtil.writeVarInt(state, out);
-        }
-
-        long[] data = this.storage.getData();
-        PacketUtil.writeVarInt(data.length, out);
-        PacketUtil.writeLongs(data, out);
-    }
-
-    public int getBitsPerEntry() {
-        return this.bitsPerEntry;
-    }
-
-    public List<Integer> getStates() {
-        return Collections.unmodifiableList(this.states);
-    }
-
-    public FlexibleStorage getStorage() {
-        return this.storage;
-    }
-
-    public int get(int x, int y, int z) {
-        int id = this.storage.get(index(x, y, z));
-        return this.bitsPerEntry <= 8 ? (id >= 0 && id < this.states.size() ? this.states.get(id) : 0) : id;
-    }
-
-    public void set(int x, int y, int z, int state) {
-        set(index(x, y, z), state);
-    }
-
-    public void set(int ind, int state) {
-        int id = this.bitsPerEntry <= 8 ? this.states.indexOf(state) : state;
-        if (id == -1) {
-            this.states.add(state);
-            if (this.states.size() > 1 << this.bitsPerEntry) {
-                this.bitsPerEntry++;
-
-                List<Integer> oldStates = this.states;
-                if (this.bitsPerEntry > 8) {
-                    oldStates = new ArrayList<>(this.states);
-                    this.states.clear();
-                    this.bitsPerEntry = 13;
-                }
-
-                FlexibleStorage oldStorage = this.storage;
-                this.storage = new FlexibleStorage(this.bitsPerEntry, this.storage.getSize());
-                for (int index = 0; index < this.storage.getSize(); index++) {
-                    int value = oldStorage.get(index);
-                    this.storage.set(index, this.bitsPerEntry <= 8 ? value : oldStates.get(value));
-                }
-            }
-
-            id = this.bitsPerEntry <= 8 ? this.states.indexOf(state) : state;
-        }
-
-        this.storage.set(ind, id);
-    }
-
-    public boolean isEmpty() {
-        for (int index = 0; index < this.storage.getSize(); index++) {
-            if (this.storage.get(index) != 0) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return this == o || (o instanceof BlockStorage && this.bitsPerEntry == ((BlockStorage) o).bitsPerEntry && this.states.equals(((BlockStorage) o).states) && this.storage.equals(((BlockStorage) o).storage));
-    }
-
-    @Override
-    public int hashCode() {
-        int result = this.bitsPerEntry;
-        result = 31 * result + this.states.hashCode();
-        result = 31 * result + this.storage.hashCode();
-        return result;
-    }
-}

src/main/java/org/spacehq/mc/protocol/data/game/chunk/Chunk.java

@@ -1,46 +0,0 @@
-package org.spacehq.mc.protocol.data.game.chunk;
-
-public class Chunk {
-    private BlockStorage blocks;
-    private NibbleArray3d blocklight;
-    private NibbleArray3d skylight;
-
-    public Chunk(boolean skylight) {
-        this(new BlockStorage(), new NibbleArray3d(2048), skylight ? new NibbleArray3d(2048) : null);
-    }
-
-    public Chunk(BlockStorage blocks, NibbleArray3d blocklight, NibbleArray3d skylight) {
-        this.blocks = blocks;
-        this.blocklight = blocklight;
-        this.skylight = skylight;
-    }
-
-    public BlockStorage getBlocks() {
-        return this.blocks;
-    }
-
-    public NibbleArray3d getBlockLight() {
-        return this.blocklight;
-    }
-
-    public NibbleArray3d getSkyLight() {
-        return this.skylight;
-    }
-
-    public boolean isEmpty() {
-        return this.blocks.isEmpty();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return this == o || (o instanceof Chunk && this.blocks.equals(((Chunk) o).blocks) && this.blocklight.equals(((Chunk) o).blocklight) && ((this.skylight == null && (((Chunk) o).skylight == null)) || (this.skylight != null && this.skylight.equals(((Chunk) o).skylight))));
-    }
-
-    @Override
-    public int hashCode() {
-        int result = this.blocks.hashCode();
-        result = 31 * result + this.blocklight.hashCode();
-        result = 31 * result + (this.skylight != null ? this.skylight.hashCode() : 0);
-        return result;
-    }
-}

src/main/java/org/spacehq/mc/protocol/data/game/chunk/Column.java

@@ -1,59 +0,0 @@
-package org.spacehq.mc.protocol.data.game.chunk;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class Column {
-    private int x;
-    private int z;
-    private Chunk chunks[];
-    private byte biomeData[];
-
-    private boolean skylight;
-
-    public Column(int x, int z, Chunk chunks[]) {
-        this(x, z, chunks, null);
-    }
-
-    public Column(int x, int z, Chunk chunks[], byte biomeData[]) {
-        if(chunks.length != 16) {
-            throw new IllegalArgumentException("Chunk array length must be 16.");
-        }
-
-        if(biomeData != null && biomeData.length != 256) {
-            throw new IllegalArgumentException("Biome data array length must be 256.");
-        }
-
-        this.skylight = false;
-        boolean noSkylight = false;
-        for (Chunk chunk : chunks) {
-            if (chunk != null) {
-                if (chunk.getSkyLight() == null) {
-                    noSkylight = true;
-                } else {
-                    this.skylight = true;
-                }
-            }
-        }
-
-        if(noSkylight && this.skylight) {
-            throw new IllegalArgumentException("Either all chunks must have skylight values or none must have them.");
-        }
-
-        this.x = x;
-        this.z = z;
-        this.chunks = chunks;
-        this.biomeData = biomeData;
-    }
-
-
-    public boolean hasBiomeData() {
-        return this.biomeData != null;
-    }
-
-    public boolean hasSkylight() {
-        return this.skylight;
-    }
-}

src/main/java/org/spacehq/mc/protocol/data/game/chunk/FlexibleStorage.java

@@ -1,104 +0,0 @@
-package org.spacehq.mc.protocol.data.game.chunk;
-
-import java.util.Arrays;
-
-public class FlexibleStorage {
-    private final long[] data;
-    private final int bitsPerEntry;
-    private final int size;
-    private final long maxEntryValue;
-
-    public FlexibleStorage(int bitsPerEntry, int size) {
-        this(bitsPerEntry, new long[roundToNearest(size * bitsPerEntry, 64) / 64]);
-    }
-
-    public FlexibleStorage(int bitsPerEntry, long[] data) {
-        if(bitsPerEntry < 1 || bitsPerEntry > 32) {
-            throw new IllegalArgumentException("BitsPerEntry cannot be outside of accepted range.");
-        }
-
-        this.bitsPerEntry = bitsPerEntry;
-        this.data = data;
-
-        this.size = this.data.length * 64 / this.bitsPerEntry;
-        this.maxEntryValue = (1L << this.bitsPerEntry) - 1;
-    }
-
-    public long[] getData() {
-        return this.data;
-    }
-
-    public int getBitsPerEntry() {
-        return this.bitsPerEntry;
-    }
-
-    public int getSize() {
-        return this.size;
-    }
-
-    public int get(int index) {
-        if(index < 0 || index > this.size - 1) {
-            throw new IndexOutOfBoundsException();
-        }
-
-        int bitIndex = index * this.bitsPerEntry;
-        int startIndex = bitIndex / 64;
-        int endIndex = ((index + 1) * this.bitsPerEntry - 1) / 64;
-        int startBitSubIndex = bitIndex % 64;
-        if(startIndex == endIndex) {
-            return (int) (this.data[startIndex] >>> startBitSubIndex & this.maxEntryValue);
-        } else {
-            int endBitSubIndex = 64 - startBitSubIndex;
-            return (int) ((this.data[startIndex] >>> startBitSubIndex | this.data[endIndex] << endBitSubIndex) & this.maxEntryValue);
-        }
-    }
-
-    public void set(int index, int value) {
-        if(index < 0 || index > this.size - 1) {
-            throw new IndexOutOfBoundsException();
-        }
-
-        if(value < 0 || value > this.maxEntryValue) {
-            throw new IllegalArgumentException("Value cannot be outside of accepted range.");
-        }
-
-        int bitIndex = index * this.bitsPerEntry;
-        int startIndex = bitIndex / 64;
-        int endIndex = ((index + 1) * this.bitsPerEntry - 1) / 64;
-        int startBitSubIndex = bitIndex % 64;
-        this.data[startIndex] = this.data[startIndex] & ~(this.maxEntryValue << startBitSubIndex) | ((long) value & this.maxEntryValue) << startBitSubIndex;
-        if(startIndex != endIndex) {
-            int endBitSubIndex = 64 - startBitSubIndex;
-            this.data[endIndex] = this.data[endIndex] >>> endBitSubIndex << endBitSubIndex | ((long) value & this.maxEntryValue) >> endBitSubIndex;
-        }
-    }
-
-    private static int roundToNearest(int value, int roundTo) {
-        if(roundTo == 0) {
-            return 0;
-        } else if(value == 0) {
-            return roundTo;
-        } else {
-            if(value < 0) {
-                roundTo *= -1;
-            }
-
-            int remainder = value % roundTo;
-            return remainder != 0 ? value + roundTo - remainder : value;
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return this == o || (o instanceof FlexibleStorage && Arrays.equals(this.data, ((FlexibleStorage) o).data) && this.bitsPerEntry == ((FlexibleStorage) o).bitsPerEntry && this.size == ((FlexibleStorage) o).size && this.maxEntryValue == ((FlexibleStorage) o).maxEntryValue);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = Arrays.hashCode(this.data);
-        result = 31 * result + this.bitsPerEntry;
-        result = 31 * result + this.size;
-        result = 31 * result + (int) this.maxEntryValue;
-        return result;
-    }
-}

src/main/java/org/spacehq/mc/protocol/data/game/chunk/NibbleArray3d.java

@@ -1,71 +0,0 @@
-package org.spacehq.mc.protocol.data.game.chunk;
-
-import io.netty.buffer.ByteBuf;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class NibbleArray3d {
-    private byte[] data;
-
-    public NibbleArray3d(int size) {
-        this.data = new byte[size];
-    }
-
-    public NibbleArray3d(byte[] array) {
-        this.data = array;
-    }
-
-    public NibbleArray3d(ByteBuf in, int size) throws IOException {
-        this.data = new byte[size];
-        in.readBytes(this.data);
-    }
-
-    public void write(ByteBuf out) throws IOException {
-        out.writeBytes(this.data);
-    }
-
-    public byte[] getData() {
-        return this.data;
-    }
-
-    public int get(int x, int y, int z) {
-        int key = y << 8 | z << 4 | x;
-        int index = key >> 1;
-        int part = key & 1;
-        return part == 0 ? this.data[index] & 15 : this.data[index] >> 4 & 15;
-    }
-
-    public void set(int x, int y, int z, int val) {
-        int key = y << 8 | z << 4 | x;
-        int index = key >> 1;
-        int part = key & 1;
-        if(part == 0) {
-            this.data[index] = (byte) (this.data[index] & 240 | val & 15);
-        } else {
-            this.data[index] = (byte) (this.data[index] & 15 | (val & 15) << 4);
-        }
-    }
-
-    public void fill(int val) {
-        for(int index = 0; index < this.data.length << 1; index++) {
-            int ind = index >> 1;
-            int part = index & 1;
-            if(part == 0) {
-                this.data[ind] = (byte) (this.data[ind] & 240 | val & 15);
-            } else {
-                this.data[ind] = (byte) (this.data[ind] & 15 | (val & 15) << 4);
-            }
-        }
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        return this == o || (o instanceof NibbleArray3d && Arrays.equals(this.data, ((NibbleArray3d) o).data));
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(this.data);
-    }
-}

src/main/java/org/spacehq/mc/protocol/util/NetUtil.java

@@ -1,117 +0,0 @@
-package org.spacehq.mc.protocol.util;
-
-import io.netty.buffer.ByteBuf;
-import org.spacehq.mc.protocol.data.game.chunk.Chunk;
-import org.spacehq.mc.protocol.data.game.chunk.Column;
-import org.spacehq.mc.protocol.data.game.chunk.NibbleArray3d;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.ShortBuffer;
-
-/* From https://github.com/Steveice10/MCProtocolLib/ */
-/* No credit taken for writing this code, and used accordance to it's license
-   Original by Steveice10, modified to suit this plugin.
- */
-public class NetUtil {
-    public static int writeNewColumn(ByteBuf out, Column column, boolean fullChunk, boolean hasSkylight) throws IOException {
-        int mask = 0;
-        Chunk chunks[] = column.getChunks();
-        for (int index = 0; index < chunks.length; index++) {
-            Chunk chunk = chunks[index];
-            if (chunk != null && (!fullChunk || !chunk.isEmpty())) {
-                mask |= 1 << index;
-                chunk.getBlocks().write(out);
-                chunk.getBlockLight().write(out);
-                if (hasSkylight || column.hasSkylight()) {
-                    chunk.getSkyLight().write(out); // TODO: Make a PR to original lib to correct this
-                }
-            }
-        }
-
-        if (fullChunk && column.getBiomeData() != null) {
-            out.writeBytes(column.getBiomeData());
-        }
-
-        return mask;
-    }
-
-    public static Column readOldChunkData(int x, int z, boolean isFullChunk, int bitmask, byte[] input, boolean checkForSky, boolean hasSkyLight) {
-        int pos = 0;
-        int expected = isFullChunk ? 256 : 0;
-        boolean sky = false;
-        ShortBuffer buf = ByteBuffer.wrap(input).order(ByteOrder.LITTLE_ENDIAN).asShortBuffer();
-        // 0 = Calculate expected length and determine if the packet has skylight.
-        // 1 = Create chunks from mask and get blocks.
-        // 2 = Get block light.
-        // 3 = Get sky light.
-        Chunk[] chunks = new Chunk[16];
-        int chunkCount = 0;
-        for (int pass = 0; pass < 4; pass++) {
-            if(pass == 1){
-                if(chunkCount == 0) return null;
-            }
-            for (int ind = 0; ind < 16; ind++) {
-                if ((bitmask & 1 << ind) != 0) {
-                    if (pass == 0) {
-                        chunkCount++;
-                        // Block length + Blocklight length
-                        expected += (4096 * 2) + 2048;
-                    }
-
-                    if (pass == 1) {
-                        chunks[ind] = new Chunk(sky || hasSkyLight);
-                        buf.position(pos / 2);
-                        int buffPos = buf.position();
-                        // convert short array to new one
-
-                        for (int index = 0; index < 4096; index++) {
-                            short ss = buf.get(buffPos + index);
-                            // s is 16 bits, 12 bits id and 4 bits data
-                            int data = ss & 0xF;
-                            int id = (ss >> 4) << 4 | data;
-
-                            int newCombined = id; // test
-
-                            chunks[ind].getBlocks().set(index, newCombined);
-                        }
-                        pos += 4096 * 2;
-
-                    }
-
-                    if (pass == 2) {
-                        NibbleArray3d blocklight = chunks[ind].getBlockLight();
-                        System.arraycopy(input, pos, blocklight.getData(), 0, blocklight.getData().length);
-                        pos += blocklight.getData().length;
-                    }
-
-                    if (pass == 3) {
-                        if (sky) {
-                            NibbleArray3d skylight = chunks[ind].getSkyLight();
-                            System.arraycopy(input, pos, skylight.getData(), 0, skylight.getData().length);
-                            pos += skylight.getData().length;
-                        }
-                    }
-                }
-            }
-
-            if (pass == 0) {
-                // If we have more data than blocks and blocklight combined, there must be skylight data as well.
-                if (input.length > expected) {
-                    sky = checkForSky;
-                }
-            }
-        }
-
-        byte biomeData[] = null;
-        if (isFullChunk && (pos + 256 <= input.length)) {
-
-            biomeData = new byte[256];
-            System.arraycopy(input, pos, biomeData, 0, biomeData.length);
-        }
-
-        Column column = new Column(x, z, chunks, biomeData);
-        return column;
-    }
-}

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

@@ -1,59 +0,0 @@
-package us.myles.ViaVersion;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandler;
-import io.netty.channel.socket.SocketChannel;
-import lombok.Getter;
-import lombok.Setter;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import us.myles.ViaVersion.packets.State;
-
-@Getter
-@Setter
-public class ConnectionInfo {
-    private final SocketChannel channel;
-    private Object lastPacket;
-    private java.util.UUID UUID;
-    private State state = State.HANDSHAKE;
-    private String openWindow;
-    private int protocol = 0;
-    private int compression = 0;
-    private int entityID;
-    private boolean active = true;
-    private String username;
-
-    public ConnectionInfo(SocketChannel socketChannel) {
-        this.channel = socketChannel;
-    }
-
-    public Player getPlayer() {
-        return UUID == null ? null : Bukkit.getPlayer(UUID);
-    }
-
-    public void setActive(boolean active) {
-        this.active = active;
-    }
-
-    public void sendRawPacket(final ByteBuf packet, boolean currentThread) {
-        final ChannelHandler handler = channel.pipeline().get("encoder");
-        if (currentThread) {
-            channel.pipeline().context(handler).writeAndFlush(packet);
-        } else {
-            channel.eventLoop().submit(new Runnable() {
-                @Override
-                public void run() {
-                    channel.pipeline().context(handler).writeAndFlush(packet);
-                }
-            });
-        }
-    }
-
-    public void sendRawPacket(final ByteBuf packet) {
-        sendRawPacket(packet, false);
-    }
-
-    public void closeWindow() {
-        this.openWindow = null;
-    }
-}

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

@@ -0,0 +1,39 @@
+package us.myles.ViaVersion;
+
+import org.bukkit.scheduler.BukkitRunnable;
+import us.myles.ViaVersion.api.data.UserConnection;
+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.MovementTracker;
+import us.myles.ViaVersion.util.ReflectionUtil;
+
+import java.util.Map;
+import java.util.UUID;
+
+public class ViaIdleThread extends BukkitRunnable {
+    private final Map<UUID, UserConnection> portedPlayers;
+    private final Object idlePacket;
+
+    public ViaIdleThread(Map<UUID, UserConnection> portedPlayers) {
+        this.portedPlayers = portedPlayers;
+        try {
+            Class<?> idlePacketClass = ReflectionUtil.nms("PacketPlayInFlying");
+            idlePacket = idlePacketClass.newInstance();
+        } catch (InstantiationException | IllegalArgumentException | IllegalAccessException | ClassNotFoundException e) {
+            throw new RuntimeException("Couldn't find/make player idle packet, help!", e);
+        }
+    }
+
+    @Override
+    public void run() {
+        for (UserConnection info : portedPlayers.values()) {
+            if (info.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) {
+                long nextIdleUpdate = info.get(MovementTracker.class).getNextIdlePacket();
+                if (nextIdleUpdate <= System.currentTimeMillis()) {
+                    info.getChannel().pipeline().fireChannelRead(idlePacket);
+                    info.get(MovementTracker.class).incrementIdlePacket();
+                }
+            }
+        }
+    }
+}

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

@@ -5,28 +5,29 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
+import lombok.NonNull;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.ViaVersionAPI;
+import us.myles.ViaVersion.api.ViaVersionConfig;
 import us.myles.ViaVersion.api.boss.BossBar;
 import us.myles.ViaVersion.api.boss.BossColor;
 import us.myles.ViaVersion.api.boss.BossStyle;
-import us.myles.ViaVersion.armor.ArmorListener;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
 import us.myles.ViaVersion.boss.ViaBossBar;
 import us.myles.ViaVersion.commands.ViaVersionCommand;
 import us.myles.ViaVersion.handlers.ViaVersionInitializer;
-import us.myles.ViaVersion.listeners.CommandBlockListener;
+import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.update.UpdateListener;
 import us.myles.ViaVersion.update.UpdateUtil;
+import us.myles.ViaVersion.util.Configuration;
 import us.myles.ViaVersion.util.ListWrapper;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
+import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.List;
@@ -37,109 +38,161 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
+public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI, ViaVersionConfig {
 
-    private final Map<UUID, ConnectionInfo> portedPlayers = new ConcurrentHashMap<>();
+    private final Map<UUID, UserConnection> portedPlayers = new ConcurrentHashMap<>();
     private boolean debug = false;
 
-    public static ItemStack getHandItem(final ConnectionInfo info) {
-        try {
-            return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<ItemStack>() {
-                @Override
-                public ItemStack call() throws Exception {
-                    if (info.getPlayer() != null) {
-                        return info.getPlayer().getItemInHand();
-                    }
-                    return null;
-                }
-            }).get(10, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            System.out.println("Error fetching hand item: " + e.getClass().getName());
-            if (ViaVersion.getInstance().isDebug())
-                e.printStackTrace();
-            return null;
-        }
-    }
-
     @Override
     public void onEnable() {
         ViaVersion.setInstance(this);
-        saveDefaultConfig();
+        generateConfig();
         if (System.getProperty("ViaVersion") != null) {
             getLogger().severe("ViaVersion is already loaded, we don't support reloads. Please reboot if you wish to update.");
             getLogger().severe("Some features may not work.");
             return;
         }
 
-        getLogger().info("ViaVersion " + getDescription().getVersion() + " is now enabled, injecting. (Allows 1.8 to be accessed via 1.9)");
-        injectPacketHandler();
+        // Gather version :)
+        Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
+            @Override
+            public void run() {
+                gatherProtocolVersion();
+                // Check if there are any pipes to this version
+                if (ProtocolRegistry.SERVER_PROTOCOL != -1) {
+                    getLogger().info("ViaVersion detected protocol version: " + ProtocolRegistry.SERVER_PROTOCOL);
+                    if (!ProtocolRegistry.isWorkingPipe()) {
+                        getLogger().warning("ViaVersion will not function on the current protocol.");
+                    }
+                }
+            }
+        });
 
-        if (getConfig().getBoolean("checkforupdates"))
+        getLogger().info("ViaVersion " + getDescription().getVersion() + " is now enabled, injecting.");
+        injectPacketHandler();
+        if (getConfig().getBoolean("simulate-pt", true))
+            new ViaIdleThread(portedPlayers).runTaskTimerAsynchronously(this, 1L, 1L); // Updates player's idle status
+
+        if (isCheckForUpdates())
             UpdateUtil.sendUpdateMessage(this);
 
-        Bukkit.getPluginManager().registerEvents(new Listener() {
-            @EventHandler
-            public void onPlayerQuit(PlayerQuitEvent e) {
-                removePortedClient(e.getPlayer().getUniqueId());
-            }
-        }, this);
-
-        Bukkit.getPluginManager().registerEvents(new ArmorListener(this), this);
-        Bukkit.getPluginManager().registerEvents(new CommandBlockListener(this), this);
         Bukkit.getPluginManager().registerEvents(new UpdateListener(this), this);
 
         getCommand("viaversion").setExecutor(new ViaVersionCommand(this));
     }
 
+    public void gatherProtocolVersion() {
+        try {
+            Class<?> serverClazz = ReflectionUtil.nms("MinecraftServer");
+            Object server = ReflectionUtil.invokeStatic(serverClazz, "getServer");
+            Class<?> pingClazz = ReflectionUtil.nms("ServerPing");
+            Object ping = null;
+            // Search for ping method
+            for (Field f : serverClazz.getDeclaredFields()) {
+                if (f.getType() != null) {
+                    if (f.getType().getSimpleName().equals("ServerPing")) {
+                        f.setAccessible(true);
+                        ping = f.get(server);
+                    }
+                }
+            }
+            if (ping != null) {
+                Object serverData = null;
+                for (Field f : pingClazz.getDeclaredFields()) {
+                    if (f.getType() != null) {
+                        if (f.getType().getSimpleName().endsWith("ServerData")) {
+                            f.setAccessible(true);
+                            serverData = f.get(ping);
+                        }
+                    }
+                }
+                if (serverData != null) {
+                    int protocolVersion = -1;
+                    for (Field f : serverData.getClass().getDeclaredFields()) {
+                        if (f.getType() != null) {
+                            if (f.getType() == int.class) {
+                                f.setAccessible(true);
+                                protocolVersion = (int) f.get(serverData);
+                            }
+                        }
+                    }
+                    if (protocolVersion != -1) {
+                        ProtocolRegistry.SERVER_PROTOCOL = protocolVersion;
+                        return;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            // We couldn't work it out... We'll just use ping and hope for the best...
+        }
+    }
+
+    public void generateConfig() {
+        File file = new File(getDataFolder(), "config.yml");
+        if (file.exists()) {
+            // Update config options
+            Configuration oldConfig = new Configuration(file);
+            oldConfig.reload(false); // Load current options from config
+            file.delete(); // Delete old config
+            saveDefaultConfig(); // Generate new config
+            Configuration newConfig = new Configuration(file);
+            newConfig.reload(true); // Load default options
+            for (String key : oldConfig.getKeys(false)) {
+                // Set option in new config if exists
+                if (newConfig.contains(key)) {
+                    newConfig.set(key, oldConfig.get(key));
+                }
+            }
+            newConfig.save();
+        } else {
+            saveDefaultConfig();
+        }
+    }
+
     public void injectPacketHandler() {
         try {
             Class<?> serverClazz = ReflectionUtil.nms("MinecraftServer");
             Object server = ReflectionUtil.invokeStatic(serverClazz, "getServer");
-            Object connection = serverClazz.getDeclaredMethod("getServerConnection").invoke(server);
-            if (connection == null) {
-                System.out.println("connection is null!!");
-                //try others
-                for (Method m : serverClazz.getDeclaredMethods()) {
-                    if (m.getReturnType() != null && !m.getName().equals("getServerConnection")) {
-                        if (m.getReturnType().getSimpleName().equals("ServerConnection")) {
-                            if (m.getParameterTypes().length == 0) {
-                                connection = m.invoke(server);
-                            }
+            Object connection = null;
+            for (Method m : serverClazz.getDeclaredMethods()) {
+                if (m.getReturnType() != null) {
+                    if (m.getReturnType().getSimpleName().equals("ServerConnection")) {
+                        if (m.getParameterTypes().length == 0) {
+                            connection = m.invoke(server);
                         }
                     }
                 }
-                if (connection == null) {
-                    getLogger().warning("We failed to find the ServerConnection? :(");
-                    return;
-                }
             }
-            if (connection != null) {
-                for (Field field : connection.getClass().getDeclaredFields()) {
-                    field.setAccessible(true);
-                    final Object value = field.get(connection);
-                    if (value instanceof List) {
-                        // Inject the list
-                        List wrapper = new ListWrapper((List) value) {
-                            @Override
-                            public synchronized void handleAdd(Object o) {
-                                synchronized (this) {
-                                    if (o instanceof ChannelFuture) {
-                                        inject((ChannelFuture) o);
-                                    }
-                                }
-                            }
-                        };
-                        field.set(connection, wrapper);
-                        // Iterate through current list
-                        synchronized (wrapper) {
-                            for (Object o : (List) value) {
+            if (connection == null) {
+                getLogger().warning("We failed to find the ServerConnection? :( What server are you running?");
+                return;
+            }
+            for (Field field : connection.getClass().getDeclaredFields()) {
+                field.setAccessible(true);
+                final Object value = field.get(connection);
+                if (value instanceof List) {
+                    // Inject the list
+                    List wrapper = new ListWrapper((List) value) {
+                        @Override
+                        public synchronized void handleAdd(Object o) {
+                            synchronized (this) {
                                 if (o instanceof ChannelFuture) {
                                     inject((ChannelFuture) o);
-                                } else {
-                                    break; // not the right list.
                                 }
                             }
                         }
+                    };
+                    field.set(connection, wrapper);
+                    // Iterate through current list
+                    synchronized (wrapper) {
+                        for (Object o : (List) value) {
+                            if (o instanceof ChannelFuture) {
+                                inject((ChannelFuture) o);
+                            } else {
+                                break; // not the right list.
+                            }
+                        }
                     }
                 }
             }
@@ -173,6 +226,20 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         return isPorted(player.getUniqueId());
     }
 
+    @Override
+    public int getPlayerVersion(@NonNull Player player) {
+        if (!isPorted(player))
+            return ProtocolRegistry.SERVER_PROTOCOL;
+        return portedPlayers.get(player.getUniqueId()).get(ProtocolInfo.class).getProtocolVersion();
+    }
+
+    @Override
+    public int getPlayerVersion(@NonNull UUID uuid) {
+        if (!isPorted(uuid))
+            return ProtocolRegistry.SERVER_PROTOCOL;
+        return portedPlayers.get(uuid).get(ProtocolInfo.class).getProtocolVersion();
+    }
+
     @Override
     public boolean isPorted(UUID playerUUID) {
         return portedPlayers.containsKey(playerUUID);
@@ -183,14 +250,22 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         return getDescription().getVersion();
     }
 
+    public UserConnection getConnection(UUID playerUUID) {
+        return portedPlayers.get(playerUUID);
+    }
+
+    public UserConnection getConnection(Player player) {
+        return portedPlayers.get(player.getUniqueId());
+    }
+
     public void sendRawPacket(Player player, ByteBuf packet) throws IllegalArgumentException {
         sendRawPacket(player.getUniqueId(), packet);
     }
 
     @Override
     public void sendRawPacket(UUID uuid, ByteBuf packet) throws IllegalArgumentException {
-        if (!isPorted(uuid)) throw new IllegalArgumentException("This player is not on 1.9");
-        ConnectionInfo ci = portedPlayers.get(uuid);
+        if (!isPorted(uuid)) throw new IllegalArgumentException("This player is not controlled by ViaVersion!");
+        UserConnection ci = portedPlayers.get(uuid);
         ci.sendRawPacket(packet);
     }
 
@@ -213,15 +288,18 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         this.debug = value;
     }
 
-    @Override
-    public boolean isSyncedChunks() {
-        return getConfig().getBoolean("sync-chunks", true);
+    public boolean isCheckForUpdates() {
+        return getConfig().getBoolean("checkforupdates", true);
     }
 
     public boolean isPreventCollision() {
         return getConfig().getBoolean("prevent-collision", true);
     }
 
+    public boolean isNewEffectIndicator() {
+        return getConfig().getBoolean("use-new-effect-indicator", true);
+    }
+
     public boolean isSuppressMetadataErrors() {
         return getConfig().getBoolean("suppress-metadata-errors", false);
     }
@@ -230,14 +308,33 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         return getConfig().getBoolean("shield-blocking", true);
     }
 
-    public boolean isAutoTeam() {
-        // Collision has to be enabled first
-        if (!isPreventCollision()) return false;
-        return getConfig().getBoolean("auto-team", true);
+    public boolean isHologramPatch() {
+        return getConfig().getBoolean("hologram-patch", false);
     }
 
-    public void addPortedClient(ConnectionInfo info) {
-        portedPlayers.put(info.getUUID(), info);
+    public boolean isBossbarPatch() {
+        return getConfig().getBoolean("bossbar-patch", true);
+    }
+
+    public boolean isBossbarAntiflicker() {
+        return getConfig().getBoolean("bossbar-anti-flicker", false);
+    }
+
+    public boolean isUnknownEntitiesSuppressed() {
+        return getConfig().getBoolean("suppress-entityid-errors", false);
+    }
+
+    public double getHologramYOffset() {
+        return getConfig().getDouble("hologram-y", -1D);
+    }
+
+    public boolean isAutoTeam() {
+        // Collision has to be enabled first
+        return isPreventCollision() && getConfig().getBoolean("auto-team", true);
+    }
+
+    public void addPortedClient(UserConnection info) {
+        portedPlayers.put(info.get(ProtocolInfo.class).getUuid(), info);
     }
 
     public void removePortedClient(UUID clientID) {

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

@@ -0,0 +1,286 @@
+package us.myles.ViaVersion.api;
+
+import com.google.common.base.Preconditions;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.remapper.ValueCreator;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+import us.myles.ViaVersion.exception.InformativeException;
+import us.myles.ViaVersion.handlers.ViaDecodeHandler;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+public class PacketWrapper {
+    private final ByteBuf inputBuffer;
+    private final UserConnection userConnection;
+    private boolean send = true;
+    @Setter
+    @Getter
+    private int id = -1;
+    private LinkedList<Pair<Type, Object>> readableObjects = new LinkedList<>();
+    private List<Pair<Type, Object>> packetValues = new ArrayList<>();
+
+    public PacketWrapper(int packetID, ByteBuf inputBuffer, UserConnection userConnection) {
+        this.id = packetID;
+        this.inputBuffer = inputBuffer;
+        this.userConnection = userConnection;
+    }
+
+    /**
+     * Get a part from the output
+     *
+     * @param type  The type of the part you wish to get.
+     * @param index The index of the part (relative to the type)
+     * @return The requested type or throws ArrayIndexOutOfBounds
+     */
+    public <T> T get(Type<T> type, int index) throws Exception {
+        int currentIndex = 0;
+        for (Pair<Type, Object> packetValue : packetValues) {
+            if (packetValue.getKey() == type) { // Ref check
+                if (currentIndex == index) {
+                    return (T) packetValue.getValue();
+                }
+                currentIndex++;
+            }
+        }
+
+        Exception e = new ArrayIndexOutOfBoundsException("Could not find type " + type.getTypeName() + " at " + index);
+        throw new InformativeException(e).set("Type", type.getTypeName()).set("Index", index).set("Packet ID", getId());
+    }
+
+    /**
+     * Set a currently existing part in the output
+     *
+     * @param type  The type of the part you wish to set.
+     * @param index The index of the part (relative to the type)
+     * @param value The value of the part you wish to set it to.
+     */
+    public <T> void set(Type<T> type, int index, T value) throws Exception {
+        int currentIndex = 0;
+        for (Pair<Type, Object> packetValue : packetValues) {
+            if (packetValue.getKey() == type) { // Ref check
+                if (currentIndex == index) {
+                    packetValue.setValue(value);
+                    return;
+                }
+                currentIndex++;
+            }
+        }
+        Exception e = new ArrayIndexOutOfBoundsException("Could not find type " + type.getTypeName() + " at " + index);
+        throw new InformativeException(e).set("Type", type.getTypeName()).set("Index", index).set("Packet ID", getId());
+    }
+
+    /**
+     * Read a type from the input.
+     *
+     * @param type The type you wish to read
+     * @return The requested type
+     * @throws Exception If it fails to read
+     */
+    public <T> T read(Type<T> type) throws Exception {
+        if (type == Type.NOTHING) return null;
+        if (readableObjects.isEmpty()) {
+            Preconditions.checkNotNull(inputBuffer, "This packet does not have an input buffer.");
+            // We could in the future log input read values, but honestly for things like bulk maps, mem waste D:
+            try {
+                return type.read(inputBuffer);
+            } catch (Exception e) {
+                throw new InformativeException(e).set("Type", type.getTypeName()).set("Packet ID", getId());
+            }
+        } else {
+            Pair<Type, Object> read = readableObjects.poll();
+            if (read.getKey().equals(type)) {
+                return (T) read.getValue();
+            } else {
+                if (type == Type.NOTHING) {
+                    return read(type); // retry
+                } else {
+                    Exception e = new IOException("Unable to read type " + type.getTypeName() + ", found " + read.getKey().getTypeName());
+                    throw new InformativeException(e).set("Type", type.getTypeName()).set("Packet ID", getId());
+                }
+            }
+        }
+    }
+
+    /**
+     * Write a type to the output.
+     *
+     * @param type  The type to write.
+     * @param value The value of the type to write.
+     */
+    public <T> void write(Type<T> type, T value) {
+        if (value != null) {
+            if (!type.getOutputClass().isAssignableFrom(value.getClass())) {
+                // attempt conversion
+                if (type instanceof TypeConverter) {
+                    value = (T) ((TypeConverter) type).from(value);
+                } else {
+                    System.out.println("Possible type mismatch: " + value.getClass().getName() + " -> " + type.getOutputClass());
+                }
+            }
+        }
+        packetValues.add(new Pair<Type, Object>(type, value));
+    }
+
+    /**
+     * Take a value from the input and write to the output.
+     *
+     * @param type The type to read and write.
+     * @return The type which was read/written.
+     * @throws Exception If it failed to read or write
+     */
+    public <T> T passthrough(Type<T> type) throws Exception {
+        T value = read(type);
+        write(type, value);
+        return value;
+    }
+
+    /**
+     * Write the current output to a buffer.
+     *
+     * @param buffer The buffer to write to.
+     * @throws Exception Throws an exception if it fails to write a value.
+     */
+    public void writeToBuffer(ByteBuf buffer) throws Exception {
+        if (id != -1) {
+            Type.VAR_INT.write(buffer, id);
+        }
+        if (readableObjects.size() > 0) {
+            packetValues.addAll(readableObjects);
+        }
+
+        int index = 0;
+        for (Pair<Type, Object> packetValue : packetValues) {
+            try {
+                Object value = packetValue.getValue();
+                if (value != null) {
+                    if (!packetValue.getKey().getOutputClass().isAssignableFrom(value.getClass())) {
+                        // attempt conversion
+                        if (packetValue.getKey() instanceof TypeConverter) {
+                            value = ((TypeConverter) packetValue.getKey()).from(value);
+                        } else {
+                            System.out.println("Possible type mismatch: " + value.getClass().getName() + " -> " + packetValue.getKey().getOutputClass());
+                        }
+                    }
+                }
+                packetValue.getKey().write(buffer, value);
+            } catch (Exception e) {
+                throw new InformativeException(e).set("Index", index).set("Type", packetValue.getKey().getTypeName()).set("Packet ID", getId());
+            }
+            index++;
+        }
+        writeRemaining(buffer);
+    }
+
+    /**
+     * Clear the input buffer / readable objects
+     */
+    public void clearInputBuffer() {
+        if (inputBuffer != null)
+            inputBuffer.clear();
+        readableObjects.clear(); // :(
+    }
+
+    private void writeRemaining(ByteBuf output) {
+        if (inputBuffer != null) {
+            output.writeBytes(inputBuffer);
+        }
+    }
+
+    /**
+     * Send this packet to the associated user.
+     * Be careful not to send packets twice.
+     *
+     * @throws Exception if it fails to write
+     */
+    public void send() throws Exception {
+        if (!isCancelled()) {
+            ByteBuf output = inputBuffer == null ? Unpooled.buffer() : inputBuffer.alloc().buffer();
+            writeToBuffer(output);
+            user().sendRawPacket(output);
+        }
+    }
+
+    /**
+     * Create a new packet for the target of this packet.
+     *
+     * @param packetID The ID of the new packet
+     * @return The newly created packet wrapper
+     */
+    public PacketWrapper create(int packetID) {
+        return new PacketWrapper(packetID, null, user());
+    }
+
+    /**
+     * Create a new packet with values.
+     *
+     * @param packetID The ID of the new packet
+     * @param init     A ValueCreator to write to the packet.
+     * @return The newly created packet wrapper
+     * @throws Exception If it failed to write the values from the ValueCreator.
+     */
+    public PacketWrapper create(int packetID, ValueCreator init) throws Exception {
+        PacketWrapper wrapper = create(packetID);
+        init.write(wrapper);
+        return wrapper;
+    }
+
+    /**
+     * Cancel this packet from sending
+     */
+    public void cancel() {
+        this.send = false;
+    }
+
+    /**
+     * Check if this packet is cancelled.
+     *
+     * @return True if the packet won't be sent.
+     */
+    public boolean isCancelled() {
+        return !this.send;
+    }
+
+    /**
+     * Get the user associated with this Packet
+     *
+     * @return The user
+     */
+    public UserConnection user() {
+        return this.userConnection;
+    }
+
+    /**
+     * Reset the reader, so that it can be read again.
+     */
+    public void resetReader() {
+        this.readableObjects.addAll(packetValues);
+        this.packetValues.clear();
+    }
+
+    public void sendToServer() throws Exception {
+        if (!isCancelled()) {
+            ByteBuf output = inputBuffer == null ? Unpooled.buffer() : inputBuffer.alloc().buffer();
+            Type.VAR_INT.write(output, ViaDecodeHandler.PASSTHROUGH_ID); // Pass through
+
+            writeToBuffer(output);
+
+            boolean mark = false;
+            for (String s : user().getChannel().pipeline().names()) {
+                if (mark) {
+                    user().getChannel().pipeline().context(user().getChannel().pipeline().get(s)).fireChannelRead(output);
+                    return;
+                }
+                if (s.equalsIgnoreCase("decompress"))
+                    mark = true;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+package us.myles.ViaVersion.api;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@EqualsAndHashCode
+@ToString
+public class Pair<X, Y> {
+    private X key;
+    private Y value;
+
+    public Pair(X key, Y value) {
+        this.key = key;
+        this.value = value;
+    }
+}

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

@@ -1,11 +1,17 @@
 package us.myles.ViaVersion.api;
 
 import lombok.Getter;
-import lombok.Setter;
+import us.myles.ViaVersion.ViaVersionPlugin;
 
 public class ViaVersion {
 
     @Getter
-    @Setter
     private static ViaVersionAPI instance;
+    @Getter
+    private static ViaVersionConfig config;
+
+    public static void setInstance(ViaVersionPlugin plugin) {
+        ViaVersion.instance = plugin;
+        ViaVersion.config = plugin;
+    }
 }

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

@@ -10,13 +10,29 @@ import java.util.UUID;
 
 public interface ViaVersionAPI {
     /**
-     * Is player using 1.9?
+     * Is the player connection modified by ViaVersion?
      *
-     * @param player
-     * @return True if the client is on 1.9
+     * @param player Bukkit player object
+     * @return True if the client is modified (At the moment it also means version 1.9 and higher)
      */
     boolean isPorted(Player player);
 
+    /**
+     * Get protocol number from a player
+     *
+     * @param player Bukkit player object
+     * @return Protocol ID, For example (47=1.8-1.8.8, 107=1.9, 108=1.9.1)
+     */
+    int getPlayerVersion(Player player);
+
+    /**
+     * Get protocol number from a player
+     *
+     * @param uuid UUID of a player
+     * @return Protocol ID, For example (47=1.8-1.8.8, 107=1.9, 108=1.9.1)
+     */
+    int getPlayerVersion(UUID uuid);
+
     /**
      * Is player using 1.9?
      *
@@ -72,16 +88,9 @@ public interface ViaVersionAPI {
     BossBar createBossBar(String title, float health, BossColor color, BossStyle style);
 
     /**
-     * Obtain if global debug is enabled
+     * Get if global debug is enabled
      *
      * @return true if debug is enabled
      */
     boolean isDebug();
-
-    /**
-     * Obtains if syncing chunks is on
-     *
-     * @return true if it is
-     */
-    boolean isSyncedChunks();
 }

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

@@ -0,0 +1,89 @@
+package us.myles.ViaVersion.api;
+
+public interface ViaVersionConfig {
+
+    /**
+     * Get if global debug is enabled
+     *
+     * @return true if debug is enabled
+     */
+    boolean isDebug();
+
+    /**
+     * Get if the plugin should check for updates
+     *
+     * @return true if update checking is enabled
+     */
+    boolean isCheckForUpdates();
+
+    /**
+     * Get if collision preventing for players is enabled
+     *
+     * @return true if collision preventing is enabled
+     */
+    boolean isPreventCollision();
+
+    /**
+     * Get if 1.9 clients are shown the new effect indicator in the top-right corner
+     *
+     * @return true if the using of the new effect indicator is enabled
+     */
+    boolean isNewEffectIndicator();
+
+    /**
+     * Get if metadata errors will be suppressed
+     *
+     * @return true if metadata errors suppression is enabled
+     */
+    boolean isSuppressMetadataErrors();
+
+    /**
+     * Get if blocking in 1.9 appears as a player holding a shield
+     *
+     * @return true if shield blocking is enabled
+     */
+    boolean isShieldBlocking();
+
+    /**
+     * Get if armor stand positions are fixed so holograms show up at the correct height in 1.9
+     *
+     * @return true if hologram patching is enabled
+     */
+    boolean isHologramPatch();
+
+    /**
+     * Get if boss bars are fixed for 1.9 clients
+     *
+     * @return true if boss bar patching is enabled
+     */
+    boolean isBossbarPatch();
+
+    /**
+     * Get if the boss bars for 1.9 clients are being stopped from flickering
+     * This will keep all boss bars on 100% (not recommended)
+     *
+     * @return true if boss bar anti flickering is enabled
+     */
+    boolean isBossbarAntiflicker();
+
+    /**
+     * Get if unknown entity errors will be suppressed
+     *
+     * @return true if boss bar patching is enabled
+     */
+    boolean isUnknownEntitiesSuppressed();
+
+    /**
+     * Get the vertical offset armor stands are being moved with when the hologram patch is enabled
+     *
+     * @return the vertical offset holograms will be moved with
+     */
+    double getHologramYOffset();
+
+    /**
+     * Get if players will be automatically put in the same team when collision preventing is enabled
+     *
+     * @return true if automatic teaming is enabled
+     */
+    boolean isAutoTeam();
+}

src/main/java/us/myles/ViaVersion/api/boss/BossBar.java

@@ -6,13 +6,6 @@ import java.util.Set;
 import java.util.UUID;
 
 public interface BossBar {
-    /**
-     * Change the title
-     *
-     * @param title Title can be in either JSON or just text
-     */
-    void setTitle(String title);
-
     /**
      * Get the current title
      *
@@ -21,11 +14,11 @@ public interface BossBar {
     String getTitle();
 
     /**
-     * Change the health
+     * Change the title
      *
-     * @param health this float has to be between 0F - 1F
+     * @param title Title can be in either JSON or just text
      */
-    void setHealth(float health);
+    BossBar setTitle(String title);
 
     /**
      * Get the health
@@ -35,11 +28,11 @@ public interface BossBar {
     float getHealth();
 
     /**
-     * Yay colors!
+     * Change the health
      *
-     * @param color Whatever color you want!
+     * @param health this float has to be between 0F - 1F
      */
-    void setColor(BossColor color);
+    BossBar setHealth(float health);
 
     /**
      * Get the bossbar color
@@ -49,11 +42,11 @@ public interface BossBar {
     BossColor getColor();
 
     /**
-     * Change the bosbar style
+     * Yay colors!
      *
-     * @param style BossStyle
+     * @param color Whatever color you want!
      */
-    void setStyle(BossStyle style);
+    BossBar setColor(BossColor color);
 
     /**
      * Get the bosbar style
@@ -62,33 +55,40 @@ public interface BossBar {
      */
     BossStyle getStyle();
 
+    /**
+     * Change the bosbar style
+     *
+     * @param style BossStyle
+     */
+    BossBar setStyle(BossStyle style);
+
     /**
      * Show the bossbar to a player.
      *
      * @param player
      */
-    void addPlayer(Player player);
+    BossBar addPlayer(Player player);
 
     /**
      * Remove the bossbar from a player
      *
      * @param player
      */
-    void removePlayer(Player player);
+    BossBar removePlayer(Player player);
 
     /**
      * Add flags
      *
      * @param flag
      */
-    void addFlag(BossFlag flag);
+    BossBar addFlag(BossFlag flag);
 
     /**
      * Remove flags.
      *
      * @param flag
      */
-    void removeFlag(BossFlag flag);
+    BossBar removeFlag(BossFlag flag);
 
     /**
      * @param flag
@@ -106,12 +106,12 @@ public interface BossBar {
     /**
      * Show the bossbar to everyone (In the getPlayer set)
      */
-    void show();
+    BossBar show();
 
     /**
      * Hide the bossbar from everyone (In the getPlayer set)
      */
-    void hide();
+    BossBar hide();
 
     /**
      * Is it visible?

src/main/java/us/myles/ViaVersion/api/data/StoredObject.java

@@ -0,0 +1,11 @@
+package us.myles.ViaVersion.api.data;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter(AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class StoredObject {
+    private UserConnection user;
+}

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

@@ -0,0 +1,103 @@
+package us.myles.ViaVersion.api.data;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.socket.SocketChannel;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class UserConnection {
+    @Getter
+    private final SocketChannel channel;
+    Map<Class, StoredObject> storedObjects = new ConcurrentHashMap<>();
+    @Getter
+    @Setter
+    private boolean active = true;
+    @Getter
+    @Setter
+    private Object lastPacket;
+    @Getter
+    private long sentPackets = 0L;
+    @Getter
+    private long receivedPackets = 0L;
+
+
+    public UserConnection(SocketChannel socketChannel) {
+        this.channel = socketChannel;
+    }
+
+    /**
+     * Get an object from the storage
+     *
+     * @param objectClass The class of the object to get
+     * @return The requested object
+     */
+    public <T extends StoredObject> T get(Class<T> objectClass) {
+        return (T) storedObjects.get(objectClass);
+    }
+
+    /**
+     * Check if the storage has an object
+     *
+     * @param objectClass The object class to check
+     * @return True if the object is in the storage
+     */
+    public boolean has(Class<? extends StoredObject> objectClass) {
+        return storedObjects.containsKey(objectClass);
+    }
+
+    /**
+     * Put an object into the stored objects based on class
+     *
+     * @param object The object to store.
+     */
+    public void put(StoredObject object) {
+        storedObjects.put(object.getClass(), object);
+    }
+
+    /**
+     * Send a raw packet to the player
+     *
+     * @param packet        The raw packet to send
+     * @param currentThread Should it run in the same thread
+     */
+    public void sendRawPacket(final ByteBuf packet, boolean currentThread) {
+        final ChannelHandler handler = channel.pipeline().get("encoder");
+        if (currentThread) {
+            channel.pipeline().context(handler).writeAndFlush(packet);
+        } else {
+            channel.eventLoop().submit(new Runnable() {
+                @Override
+                public void run() {
+                    channel.pipeline().context(handler).writeAndFlush(packet);
+                }
+            });
+        }
+    }
+
+    /**
+     * Send a raw packet to the player (netty thread)
+     *
+     * @param packet The packet to send
+     */
+    public void sendRawPacket(final ByteBuf packet) {
+        sendRawPacket(packet, false);
+    }
+
+    /**
+     * Used for incrementing the number of packets sent to the client
+     */
+    public void incrementSent() {
+        this.sentPackets++;
+    }
+
+    /**
+     * Used for incrementing the number of packets received from the client
+     */
+    public void incrementReceived() {
+        this.receivedPackets++;
+    }
+}

src/main/java/us/myles/ViaVersion/api/minecraft/Position.java

@@ -0,0 +1,12 @@
+package us.myles.ViaVersion.api.minecraft;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public class Position {
+    private Long x;
+    private Long y;
+    private Long z;
+}

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

@@ -0,0 +1,36 @@
+package us.myles.ViaVersion.api.minecraft.chunks;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public class Chunk {
+    private final int x;
+    private final int z;
+    private final boolean groundUp;
+    private final int primaryBitmask;
+    private final ChunkSection[] sections;
+    private final byte[] biomeData;
+    private boolean unloadPacket = false;
+
+    /**
+     * Chunk unload.
+     *
+     * @param x coord
+     * @param z coord
+     */
+    public Chunk(int x, int z) {
+        this(x, z, true, 0, new ChunkSection[16], null);
+        this.unloadPacket = true;
+    }
+
+    /**
+     * Does this chunk have biome data
+     *
+     * @return True if the chunk has biome data
+     */
+    public boolean hasBiomeData() {
+        return biomeData != null && groundUp;
+    }
+}

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

@@ -0,0 +1,190 @@
+package us.myles.ViaVersion.api.minecraft.chunks;
+
+import com.google.common.collect.Lists;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import us.myles.ViaVersion.api.type.Type;
+
+import java.util.List;
+
+public class ChunkSection {
+    /**
+     * Size (dimensions) of blocks in a chunk 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.
+     */
+
+    private final List<Integer> palette = Lists.newArrayList();
+    private final int[] blocks;
+    private final NibbleArray blockLight;
+    private NibbleArray skyLight;
+
+    public ChunkSection() {
+        this.blocks = new int[SIZE];
+        this.blockLight = new NibbleArray(SIZE);
+        palette.add(0); // AIR
+    }
+
+    /**
+     * Set a block in the chunk
+     *
+     * @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);
+    }
+
+    /**
+     * Set a block in the chunk 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 z << 8 | y << 4 | x;
+    }
+
+    /**
+     * 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 chunk section.
+     *
+     * @return Amount of bytes sent by this section
+     */
+    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/api/minecraft/chunks/NibbleArray.java

@@ -0,0 +1,127 @@
+package us.myles.ViaVersion.api.minecraft.chunks;
+
+import java.util.Arrays;
+
+public class NibbleArray {
+    private final byte[] handle;
+
+    public NibbleArray(int length) {
+        if (length == 0 || length % 2 != 0) {
+            throw new IllegalArgumentException("Length of nibble array must be a positive number dividable by 2!");
+        }
+
+        this.handle = new byte[length / 2];
+    }
+
+    public NibbleArray(byte[] handle) {
+        if (handle.length == 0 || handle.length % 2 != 0) {
+            throw new IllegalArgumentException("Length of nibble array must be a positive number dividable by 2!");
+        }
+
+        this.handle = handle;
+    }
+
+    /**
+     * Get the value at a desired X, Y, Z
+     *
+     * @param x Block X
+     * @param y Block Y
+     * @param z Block Z
+     * @return The value at the given XYZ
+     */
+    public byte get(int x, int y, int z) {
+        return get(y << 8 | z << 4 | x);
+    }
+
+    /**
+     * Get the value at an index
+     *
+     * @param index The index to lookup
+     * @return The value at that index.
+     */
+    public byte get(int index) {
+        byte value = handle[index / 2];
+        if (index % 2 == 0) {
+            return (byte) (value & 0xF);
+        } else {
+            return (byte) ((value >> 4) & 0xF);
+        }
+    }
+
+    /**
+     * Set the value based on an x, y, z
+     *
+     * @param x     Block X
+     * @param y     Block Y
+     * @param z     Block Z
+     * @param value Desired Value
+     */
+    public void set(int x, int y, int z, int value) {
+        set(y << 8 | z << 4 | x, value);
+    }
+
+    /**
+     * Set a value at an index
+     *
+     * @param index The index to set the value at.
+     * @param value The desired value
+     */
+    public void set(int index, int value) {
+        index /= 2;
+        if (index % 2 == 0) {
+            handle[index] = (byte) (handle[index] & 0xF0 | value & 0xF);
+        } else {
+            handle[index] = (byte) (handle[index] & 0xF | (value & 0xF) << 4);
+        }
+    }
+
+    /**
+     * The size of this nibble
+     *
+     * @return The size as an int of the nibble
+     */
+    public int size() {
+        return handle.length * 2;
+    }
+
+    /**
+     * Get the actual number of bytes
+     *
+     * @return The number of bytes based on the handle.
+     */
+    public int actualSize() {
+        return handle.length;
+    }
+
+    /**
+     * Fill the array with a value
+     *
+     * @param value Value to fill with
+     */
+    public void fill(byte value) {
+        value &= 0xF; // Max nibble size (= 16)
+        Arrays.fill(handle, (byte) ((value << 4) | value));
+    }
+
+    /**
+     * Get the byte array behind this nibble
+     *
+     * @return The byte array
+     */
+    public byte[] getHandle() {
+        return handle;
+    }
+
+    /**
+     * Copy a byte array into this nibble
+     *
+     * @param handle The byte array to copy in.
+     */
+    public void setHandle(byte[] handle) {
+        if (handle.length != this.handle.length) {
+            throw new IllegalArgumentException("Length of handle must equal to size of nibble array!");
+        }
+
+        System.arraycopy(handle, 0, this.handle, 0, handle.length);
+    }
+}

src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java

@@ -0,0 +1,30 @@
+package us.myles.ViaVersion.api.minecraft.item;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.bukkit.inventory.ItemStack;
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Item {
+    private short id;
+    private byte amount;
+    private short data;
+    private CompoundTag tag;
+
+    /**
+     * Create an item from a bukkit stack (doesn't save NBT)
+     *
+     * @param stack The stack to convert from
+     * @return The output stack
+     */
+    public static Item getItem(ItemStack stack) {
+        if (stack == null) return null;
+        return new Item((short) stack.getTypeId(), (byte) stack.getAmount(), stack.getDurability(), null);
+    }
+}

src/main/java/us/myles/ViaVersion/api/minecraft/metadata/Metadata.java

@@ -0,0 +1,16 @@
+package us.myles.ViaVersion.api.minecraft.metadata;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import us.myles.ViaVersion.api.type.Type;
+
+@AllArgsConstructor
+@Getter
+@Setter
+public class Metadata {
+    private int id;
+    private int typeID;
+    private Type type;
+    private Object value;
+}

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

@@ -0,0 +1,157 @@
+package us.myles.ViaVersion.api.protocol;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import us.myles.ViaVersion.exception.CancelException;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Pair;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.packets.Direction;
+import us.myles.ViaVersion.packets.State;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public abstract class Protocol {
+    private Map<Pair<State, Integer>, ProtocolPacket> incoming = new HashMap<>();
+    private Map<Pair<State, Integer>, ProtocolPacket> outgoing = new HashMap<>();
+
+    public Protocol() {
+        registerPackets();
+        registerListeners();
+    }
+
+    /**
+     * Should this protocol filter an object packet from this class.
+     * Default: false
+     *
+     * @param packetClass The class of the current input
+     * @return True if it should handle the filtering
+     */
+    public boolean isFiltered(Class packetClass) {
+        return false;
+    }
+
+    /**
+     * Filter a packet into the output
+     *
+     * @param info   The current user connection
+     * @param packet The input packet as an object (NMS)
+     * @param output The list to put the object into.
+     * @throws Exception Throws exception if cancelled / error.
+     */
+    protected void filterPacket(UserConnection info, Object packet, List output) throws Exception {
+        output.add(packet);
+    }
+
+    /**
+     * Register listeners for this protocol
+     */
+    protected void registerListeners() {
+
+    }
+
+    /**
+     * Register the packets for this protocol
+     */
+    protected abstract void registerPackets();
+
+    /**
+     * Initialise a user for this protocol setting up objects.
+     *
+     * @param userConnection The user to initialise
+     */
+    public abstract void init(UserConnection userConnection);
+
+    /**
+     * Register an incoming packet, with simple id transformation.
+     *
+     * @param state       The state which the packet is sent in.
+     * @param oldPacketID The old packet ID
+     * @param newPacketID The new packet ID
+     */
+    public void registerIncoming(State state, int oldPacketID, int newPacketID) {
+        registerIncoming(state, oldPacketID, newPacketID, null);
+    }
+
+    /**
+     * Register an incoming packet, with id transformation and remapper.
+     *
+     * @param state          The state which the packet is sent in.
+     * @param oldPacketID    The old packet ID
+     * @param newPacketID    The new packet ID
+     * @param packetRemapper The remapper to use for the packet
+     */
+    public void registerIncoming(State state, int oldPacketID, int newPacketID, PacketRemapper packetRemapper) {
+        ProtocolPacket protocolPacket = new ProtocolPacket(state, oldPacketID, newPacketID, packetRemapper);
+        incoming.put(new Pair<>(state, newPacketID), protocolPacket);
+    }
+
+    /**
+     * Register an outgoing packet, with simple id transformation.
+     *
+     * @param state       The state which the packet is sent in.
+     * @param oldPacketID The old packet ID
+     * @param newPacketID The new packet ID
+     */
+    public void registerOutgoing(State state, int oldPacketID, int newPacketID) {
+        registerOutgoing(state, oldPacketID, newPacketID, null);
+    }
+
+    /**
+     * Register an outgoing packet, with id transformation and remapper.
+     *
+     * @param state          The state which the packet is sent in.
+     * @param oldPacketID    The old packet ID
+     * @param newPacketID    The new packet ID
+     * @param packetRemapper The remapper to use for the packet
+     */
+    public void registerOutgoing(State state, int oldPacketID, int newPacketID, PacketRemapper packetRemapper) {
+        ProtocolPacket protocolPacket = new ProtocolPacket(state, oldPacketID, newPacketID, packetRemapper);
+        outgoing.put(new Pair<>(state, oldPacketID), protocolPacket);
+    }
+
+    /**
+     * Transform a packet using this protocol
+     *
+     * @param direction     The direction the packet is going in
+     * @param state         The current protocol state
+     * @param packetWrapper The packet wrapper to transform
+     * @throws Exception Throws exception if it fails to transform
+     */
+    public void transform(Direction direction, State state, PacketWrapper packetWrapper) throws Exception {
+        Pair<State, Integer> statePacket = new Pair<>(state, packetWrapper.getId());
+        Map<Pair<State, Integer>, ProtocolPacket> packetMap = (direction == Direction.OUTGOING ? outgoing : incoming);
+        ProtocolPacket protocolPacket;
+        if (packetMap.containsKey(statePacket)) {
+            protocolPacket = packetMap.get(statePacket);
+        } else {
+            return;
+        }
+        // write packet id
+        int newID = direction == Direction.OUTGOING ? protocolPacket.getNewID() : protocolPacket.getOldID();
+        packetWrapper.setId(newID);
+        // remap
+        if (protocolPacket.getRemapper() != null) {
+            protocolPacket.getRemapper().remap(packetWrapper);
+            if (packetWrapper.isCancelled())
+                throw new CancelException();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "Protocol:" + getClass().getSimpleName();
+    }
+
+    @AllArgsConstructor
+    @Getter
+    class ProtocolPacket {
+        State state;
+        int oldID;
+        int newID;
+        PacketRemapper remapper;
+    }
+}

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

@@ -0,0 +1,161 @@
+package us.myles.ViaVersion.api.protocol;
+
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.packets.Direction;
+import us.myles.ViaVersion.packets.PacketType;
+import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.base.BaseProtocol;
+import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.logging.Level;
+
+public class ProtocolPipeline extends Protocol {
+    LinkedList<Protocol> protocolList;
+    private UserConnection userConnection;
+
+    public ProtocolPipeline(UserConnection userConnection) {
+        super();
+        init(userConnection);
+    }
+
+    @Override
+    protected void registerPackets() {
+        protocolList = new LinkedList<>();
+        // This is a pipeline so we register basic pipes
+        protocolList.addLast(new BaseProtocol());
+    }
+
+    @Override
+    public void init(UserConnection userConnection) {
+        this.userConnection = userConnection;
+
+        ProtocolInfo protocolInfo = new ProtocolInfo(userConnection);
+        protocolInfo.setPipeline(this);
+
+        userConnection.put(protocolInfo);
+
+        /* Init through all our pipes */
+        for (Protocol protocol : protocolList) {
+            protocol.init(userConnection);
+        }
+    }
+
+    /**
+     * Add a protocol to the current pipeline
+     * This will call the .init method.
+     *
+     * @param protocol The protocol to add to the end
+     */
+    public void add(Protocol protocol) {
+        if (protocolList != null) {
+            protocolList.addLast(protocol);
+            protocol.init(userConnection);
+        } else {
+            throw new NullPointerException("Tried to add protocol to early");
+        }
+    }
+
+    @Override
+    public void transform(Direction direction, State state, PacketWrapper packetWrapper) throws Exception {
+        int originalID = packetWrapper.getId();
+        List<Protocol> protocols = new ArrayList<>(protocolList);
+        // Other way if outgoing
+        if (direction == Direction.OUTGOING)
+            Collections.reverse(protocols);
+
+        for (Protocol protocol : protocols) { // Copy to prevent from removal.
+            protocol.transform(direction, state, packetWrapper);
+            // Reset the reader for the packetWrapper (So it can be recycled across packets)
+            packetWrapper.resetReader();
+        }
+        super.transform(direction, state, packetWrapper);
+
+        if (ViaVersion.getInstance().isDebug()) {
+            // Debug packet
+            String packet = "UNKNOWN";
+
+            // For 1.8/1.9 server version, eventually we'll probably get an API for this...
+            if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.V1_8 &&
+                    ProtocolRegistry.SERVER_PROTOCOL <= ProtocolVersion.V1_9_1_PRE2) {
+
+                PacketType type;
+                if (ProtocolRegistry.SERVER_PROTOCOL == ProtocolVersion.V1_8) {
+                    if (direction == Direction.INCOMING) {
+                        type = PacketType.findNewPacket(state, direction, originalID);
+                    } else {
+                        type = PacketType.findOldPacket(state, direction, originalID);
+                    }
+                } else {
+                    if (direction == Direction.INCOMING) {
+                        type = PacketType.findOldPacket(state, direction, originalID);
+                    } else {
+                        type = PacketType.findNewPacket(state, direction, originalID);
+                    }
+                }
+
+                // Filter :) This would be not hard coded too, sorry :(
+                if (type == PacketType.PLAY_CHUNK_DATA) return;
+                if (type == PacketType.PLAY_TIME_UPDATE) return;
+                if (type == PacketType.PLAY_KEEP_ALIVE) return;
+                if (type == PacketType.PLAY_KEEP_ALIVE_REQUEST) return;
+                if (type == PacketType.PLAY_ENTITY_LOOK_MOVE) return;
+                if (type == PacketType.PLAY_ENTITY_LOOK) return;
+                if (type == PacketType.PLAY_ENTITY_RELATIVE_MOVE) return;
+                if (type == PacketType.PLAY_PLAYER_POSITION_LOOK_REQUEST) return;
+                if (type == PacketType.PLAY_PLAYER_LOOK_REQUEST) return;
+                if (type == PacketType.PLAY_PLAYER_POSITION_REQUEST) return;
+
+                packet = type.name();
+            }
+            String name = packet + "[" + userConnection.get(ProtocolInfo.class).getProtocolVersion() + "]";
+            ViaVersionPlugin plugin = (ViaVersionPlugin) ViaVersion.getInstance();
+            plugin.getLogger().log(Level.INFO, "{0}: {1} {2} -> {3} [{4}]",
+                    new Object[]{
+                            direction,
+                            state,
+                            originalID,
+                            packetWrapper.getId(),
+                            name
+                    });
+        }
+    }
+
+    /**
+     * Check if the pipeline contains a protocol
+     *
+     * @param pipeClass The class to check
+     * @return True if the protocol class is in the pipeline
+     */
+    public boolean contains(Class<? extends Protocol> pipeClass) {
+        for (Protocol protocol : protocolList) {
+            if (protocol.getClass().equals(pipeClass)) return true;
+        }
+        return false;
+    }
+
+    /**
+     * Use the pipeline to filter a NMS packet
+     *
+     * @param o    The NMS packet object
+     * @param list The output list to write to
+     * @return If it should not write the input object to te list.
+     * @throws Exception If it failed to convert / packet cancelld.
+     */
+    public boolean filter(Object o, List list) throws Exception {
+        for (Protocol protocol : protocolList) {
+            if (protocol.isFiltered(o.getClass())) {
+                protocol.filterPacket(userConnection, o, list);
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

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

@@ -0,0 +1,118 @@
+package us.myles.ViaVersion.api.protocol;
+
+import us.myles.ViaVersion.api.Pair;
+import us.myles.ViaVersion.protocols.protocol1_9_1to1_9.Protocol1_9_1TO1_9;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+
+import java.util.*;
+
+public class ProtocolRegistry {
+    public static int SERVER_PROTOCOL = -1;
+    // Input Version -> Output Version & Protocol (Allows fast lookup)
+    private static Map<Integer, Map<Integer, Protocol>> registryMap = new HashMap<>();
+    private static Map<Pair<Integer, Integer>, List<Pair<Integer, Protocol>>> pathCache = new HashMap<>();
+
+    static {
+        // Register built in protocols
+        registerProtocol(new Protocol1_9TO1_8(), Collections.singletonList(ProtocolVersion.V1_9), ProtocolVersion.V1_8);
+        registerProtocol(new Protocol1_9_1TO1_9(), Collections.singletonList(ProtocolVersion.V1_9_1_PRE2), ProtocolVersion.V1_9);
+    }
+
+    /**
+     * Register a protocol
+     *
+     * @param protocol  The protocol to register.
+     * @param supported Supported client versions.
+     * @param output    The output server version it converts to.
+     */
+    public static void registerProtocol(Protocol protocol, List<Integer> supported, Integer output) {
+        // Clear cache as this may make new routes.
+        if (pathCache.size() > 0)
+            pathCache.clear();
+
+        for (Integer version : supported) {
+            if (!registryMap.containsKey(version)) {
+                registryMap.put(version, new HashMap<Integer, Protocol>());
+            }
+
+            registryMap.get(version).put(output, protocol);
+        }
+    }
+
+    /**
+     * Check if this plugin is useful to the server.
+     *
+     * @return True if there is a useful pipe
+     */
+    public static boolean isWorkingPipe() {
+        for (Map<Integer, Protocol> maps : registryMap.values()) {
+            if (maps.containsKey(SERVER_PROTOCOL)) return true;
+        }
+        return false; // No destination for protocol
+    }
+
+    /**
+     * Calculate a path to get from an input protocol to the servers protocol.
+     *
+     * @param current       The current items in the path
+     * @param clientVersion The current input version
+     * @param serverVersion The desired output version
+     * @return The path which has been generated, null if failed.
+     */
+    private static List<Pair<Integer, Protocol>> getProtocolPath(List<Pair<Integer, Protocol>> current, int clientVersion, int serverVersion) {
+        if (current.size() > 50) return null; // Fail safe, protocol too complicated.
+
+        // First check if there is any protocols for this
+        if (!registryMap.containsKey(clientVersion)) {
+            return null; // Not supported
+        }
+        // Next check there isn't an obvious path
+        Map<Integer, Protocol> inputMap = registryMap.get(clientVersion);
+        if (inputMap.containsKey(serverVersion)) {
+            current.add(new Pair<>(serverVersion, inputMap.get(serverVersion)));
+            return current; // Easy solution
+        }
+        // There might be a more advanced solution... So we'll see if any of the others can get us there
+        for (Map.Entry<Integer, Protocol> entry : inputMap.entrySet()) {
+            // Ensure it wasn't caught by the other loop
+            if (!entry.getKey().equals(serverVersion)) {
+                Pair<Integer, Protocol> pair = new Pair<>(entry.getKey(), entry.getValue());
+                // Ensure no recursion
+                if (!current.contains(pair)) {
+                    // Create a copy
+                    List<Pair<Integer, Protocol>> newCurrent = new ArrayList<>(current);
+                    newCurrent.add(pair);
+                    // Calculate the rest of the protocol using the current
+                    newCurrent = getProtocolPath(newCurrent, entry.getKey(), serverVersion);
+                    if (newCurrent != null) {
+                        return newCurrent;
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Calculate a path from a client version to server version
+     *
+     * @param clientVersion The input client version
+     * @param serverVersion The desired output server version
+     * @return The path it generated, null if it failed.
+     */
+    public static List<Pair<Integer, Protocol>> getProtocolPath(int clientVersion, int serverVersion) {
+        Pair<Integer, Integer> protocolKey = new Pair<>(clientVersion, serverVersion);
+        // Check cache
+        if (pathCache.containsKey(protocolKey)) {
+            return pathCache.get(protocolKey);
+        }
+        // Generate path
+        List<Pair<Integer, Protocol>> outputPath = getProtocolPath(new ArrayList<Pair<Integer, Protocol>>(), clientVersion, serverVersion);
+        // If it found a path, cache it.
+        if (outputPath != null) {
+            pathCache.put(protocolKey, outputPath);
+        }
+        return outputPath;
+    }
+}

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

@@ -0,0 +1,12 @@
+package us.myles.ViaVersion.api.protocol;
+
+public class ProtocolVersion {
+    /* Defined protocol constants */
+    public static final int V1_7_1 = 4;
+    public static final int V1_7_6 = 5;
+
+    public static final int V1_8 = 47;
+
+    public static final int V1_9 = 107;
+    public static final int V1_9_1_PRE2 = 108;
+}

src/main/java/us/myles/ViaVersion/api/remapper/PacketHandler.java

@@ -0,0 +1,24 @@
+package us.myles.ViaVersion.api.remapper;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.exception.InformativeException;
+
+public abstract class PacketHandler implements ValueWriter {
+    /**
+     * Handle a packet
+     *
+     * @param wrapper The associated wrapper
+     * @throws Exception Throws exception if it failed to handle the packet
+     */
+    public abstract void handle(PacketWrapper wrapper) throws Exception;
+
+    @Override
+    public void write(PacketWrapper writer, Object inputValue) throws Exception {
+        try {
+            handle(writer);
+        } catch (InformativeException e) {
+            e.addSource(this.getClass());
+            throw e;
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/api/remapper/PacketRemapper.java

@@ -0,0 +1,101 @@
+package us.myles.ViaVersion.api.remapper;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Pair;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.exception.InformativeException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class PacketRemapper {
+    private List<Pair<ValueReader, ValueWriter>> valueRemappers = new ArrayList<>();
+
+    public PacketRemapper() {
+        registerMap();
+    }
+
+    /**
+     * Map a type to the same type.
+     *
+     * @param type Type to map
+     */
+    public void map(Type type) {
+        TypeRemapper remapper = new TypeRemapper(type);
+        map(remapper, remapper);
+    }
+
+    /**
+     * Map a type from an old type to a new type
+     *
+     * @param oldType The old type
+     * @param newType The new type
+     */
+    public void map(Type oldType, Type newType) {
+        map(new TypeRemapper(oldType), new TypeRemapper(newType));
+    }
+
+    /**
+     * Map a type from an old type to a transformed new type.
+     *
+     * @param oldType     The old type
+     * @param transformer The transformer to use to produce the new type.
+     */
+    public <T1, T2> void map(Type<T1> oldType, ValueTransformer<T1, T2> transformer) {
+        map(new TypeRemapper(oldType), transformer);
+    }
+
+    /**
+     * Map a type using a basic ValueReader to a ValueWriter
+     *
+     * @param inputReader  The reader to read with.
+     * @param outputWriter The writer to write with.
+     */
+    public <T> void map(ValueReader<T> inputReader, ValueWriter<T> outputWriter) {
+        valueRemappers.add(new Pair<ValueReader, ValueWriter>(inputReader, outputWriter));
+    }
+
+    /**
+     * Create a value
+     *
+     * @param creator The creator to used to make the value(s).
+     */
+    public void create(ValueCreator creator) {
+        map(new TypeRemapper(Type.NOTHING), creator);
+    }
+
+    /**
+     * Create a handler
+     *
+     * @param handler The handler to use to handle the current packet.
+     */
+    public void handler(PacketHandler handler) {
+        map(new TypeRemapper(Type.NOTHING), handler);
+    }
+
+    /**
+     * Register the mappings for this packet
+     */
+    public abstract void registerMap();
+
+    /**
+     * Remap a packet wrapper
+     *
+     * @param packetWrapper The wrapper to remap
+     * @throws Exception Throws if it fails to write / read to the packet.
+     */
+    public void remap(PacketWrapper packetWrapper) throws Exception {
+        try {
+            // Read all the current values
+            for (Pair<ValueReader, ValueWriter> valueRemapper : valueRemappers) {
+                Object object = valueRemapper.getKey().read(packetWrapper);
+                // Convert object to write type :O!!!
+                valueRemapper.getValue().write(packetWrapper, object);
+            }
+            // If we had handlers we'd put them here
+        } catch (InformativeException e) {
+            e.addSource(this.getClass());
+            throw e;
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/api/remapper/TypeRemapper.java

@@ -0,0 +1,22 @@
+package us.myles.ViaVersion.api.remapper;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.type.Type;
+
+public class TypeRemapper<T> implements ValueReader<T>, ValueWriter<T> {
+    private final Type<T> type;
+
+    public TypeRemapper(Type<T> type) {
+        this.type = type;
+    }
+
+    @Override
+    public T read(PacketWrapper wrapper) throws Exception {
+        return wrapper.read(type);
+    }
+
+    @Override
+    public void write(PacketWrapper output, T inputValue) {
+        output.write(type, inputValue);
+    }
+}

src/main/java/us/myles/ViaVersion/api/remapper/ValueCreator.java

@@ -0,0 +1,24 @@
+package us.myles.ViaVersion.api.remapper;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.exception.InformativeException;
+
+public abstract class ValueCreator implements ValueWriter {
+    /**
+     * Write new values to a Packet.
+     *
+     * @param wrapper The packet to write to
+     * @throws Exception Throws exception if it fails to write.
+     */
+    public abstract void write(PacketWrapper wrapper) throws Exception;
+
+    @Override
+    public void write(PacketWrapper writer, Object inputValue) throws Exception {
+        try {
+            write(writer);
+        } catch (InformativeException e) {
+            e.addSource(this.getClass());
+            throw e;
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/api/remapper/ValueReader.java

@@ -0,0 +1,14 @@
+package us.myles.ViaVersion.api.remapper;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+
+public interface ValueReader<T> {
+    /**
+     * Reads value from a PacketWrapper
+     *
+     * @param wrapper The wrapper to read from
+     * @return Returns the desired type
+     * @throws Exception Throws exception if it fails to read
+     */
+    T read(PacketWrapper wrapper) throws Exception;
+}

src/main/java/us/myles/ViaVersion/api/remapper/ValueTransformer.java

@@ -0,0 +1,33 @@
+package us.myles.ViaVersion.api.remapper;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.exception.InformativeException;
+
+public abstract class ValueTransformer<T1, T2> implements ValueWriter<T1> {
+    private final Type<T2> outputType;
+
+    public ValueTransformer(Type<T2> outputType) {
+        this.outputType = outputType;
+    }
+
+    /**
+     * Transform a value from one type to another
+     *
+     * @param wrapper    The current packet
+     * @param inputValue The input value
+     * @return The value to write to the wrapper
+     * @throws Exception Throws exception if it fails to transform a value
+     */
+    public abstract T2 transform(PacketWrapper wrapper, T1 inputValue) throws Exception;
+
+    @Override
+    public void write(PacketWrapper writer, T1 inputValue) throws Exception {
+        try {
+            writer.write(outputType, transform(writer, inputValue));
+        } catch (InformativeException e) {
+            e.addSource(this.getClass());
+            throw e;
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/api/remapper/ValueWriter.java

@@ -0,0 +1,14 @@
+package us.myles.ViaVersion.api.remapper;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+
+public interface ValueWriter<T> {
+    /**
+     * Write a value to a packet
+     *
+     * @param writer     The packet wrapper to write to
+     * @param inputValue The value to write
+     * @throws Exception Throws exception if it fails to write
+     */
+    void write(PacketWrapper writer, T inputValue) throws Exception;
+}

src/main/java/us/myles/ViaVersion/api/type/ByteBufReader.java

@@ -0,0 +1,14 @@
+package us.myles.ViaVersion.api.type;
+
+import io.netty.buffer.ByteBuf;
+
+public interface ByteBufReader<T> {
+    /**
+     * Read a value from a ByteBuf
+     *
+     * @param buffer The buffer to read from.
+     * @return The type based on the class type.
+     * @throws Exception Throws exception if it failed reading.
+     */
+    T read(ByteBuf buffer) throws Exception;
+}

src/main/java/us/myles/ViaVersion/api/type/ByteBufWriter.java

@@ -0,0 +1,14 @@
+package us.myles.ViaVersion.api.type;
+
+import io.netty.buffer.ByteBuf;
+
+public interface ByteBufWriter<T> {
+    /**
+     * Write an object to a type to a ByteBuf
+     *
+     * @param buffer The buffer to write to
+     * @param object The object to write
+     * @throws Exception Throws if it failed to write
+     */
+    void write(ByteBuf buffer, T object) throws Exception;
+}

src/main/java/us/myles/ViaVersion/api/type/PartialType.java

@@ -0,0 +1,26 @@
+package us.myles.ViaVersion.api.type;
+
+import io.netty.buffer.ByteBuf;
+
+public abstract class PartialType<T, X> extends Type<T> {
+    private final X param;
+
+    public PartialType(X param, Class<T> type) {
+        super(type);
+        this.param = param;
+    }
+
+    public abstract T read(ByteBuf buffer, X param) throws Exception;
+
+    public abstract void write(ByteBuf buffer, X param, T object) throws Exception;
+
+    @Override
+    public T read(ByteBuf buffer) throws Exception {
+        return read(buffer, this.param);
+    }
+
+    @Override
+    public void write(ByteBuf buffer, T object) throws Exception {
+        write(buffer, this.param, object);
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/Type.java

@@ -0,0 +1,80 @@
+package us.myles.ViaVersion.api.type;
+
+
+import lombok.Getter;
+import org.bukkit.util.EulerAngle;
+import org.bukkit.util.Vector;
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
+import us.myles.ViaVersion.api.minecraft.Position;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.type.types.*;
+import us.myles.ViaVersion.api.type.types.minecraft.*;
+
+import java.util.UUID;
+
+@Getter
+public abstract class Type<T> implements ByteBufReader<T>, ByteBufWriter<T> {
+    /* Defined Types */
+    public static final Type<Byte> BYTE = new ByteType();
+    public static final Type<Byte[]> BYTE_ARRAY = new ArrayType<>(Type.BYTE);
+
+    public static final Type<byte[]> REMAINING_BYTES = new RemainingBytesType();
+
+    public static final Type<Short> UNSIGNED_BYTE = new UnsignedByteType();
+    public static final Type<Short[]> UNSIGNED_BYTE_ARRAY = new ArrayType<>(Type.UNSIGNED_BYTE);
+
+    public static final Type<Boolean> BOOLEAN = new BooleanType();
+    public static final Type<Boolean[]> BOOLEAN_ARRAY = new ArrayType<>(Type.BOOLEAN);
+    /* Number Types */
+    public static final Type<Integer> INT = new IntType();
+    public static final Type<Integer[]> INT_ARRAY = new ArrayType<>(Type.INT);
+
+    public static final Type<Double> DOUBLE = new DoubleType();
+    public static final Type<Double[]> DOUBLE_ARRAY = new ArrayType<>(Type.DOUBLE);
+
+    public static final Type<Long> LONG = new LongType();
+    public static final Type<Long[]> LONG_ARRAY = new ArrayType<>(Type.LONG);
+
+    public static final Type<Float> FLOAT = new FloatType();
+    public static final Type<Float[]> FLOAT_ARRAY = new ArrayType<>(Type.FLOAT);
+
+    public static final Type<Short> SHORT = new ShortType();
+    public static final Type<Short[]> SHORT_ARRAY = new ArrayType<>(Type.SHORT);
+
+    public static final Type<Integer> UNSIGNED_SHORT = new UnsignedShortType();
+    public static final Type<Integer[]> UNSIGNED_SHORT_ARRAY = new ArrayType<>(Type.UNSIGNED_SHORT);
+    /* Other Types */
+    public static final Type<String> STRING = new StringType();
+    public static final Type<String[]> STRING_ARRAY = new ArrayType<>(Type.STRING);
+
+    public static final Type<UUID> UUID = new UUIDType();
+    public static final Type<UUID[]> UUID_ARRAY = new ArrayType<>(Type.UUID);
+    /* Variable Types */
+    public static final Type<Integer> VAR_INT = new VarIntType();
+    public static final Type<Integer[]> VAR_INT_ARRAY = new ArrayType<>(Type.VAR_INT);
+    /* Special Types */
+    public static final Type<Void> NOTHING = new VoidType(); // This is purely used for remapping.
+    /* MC Types */
+    public static final Type<Position> POSITION = new PositionType();
+    public static final Type<EulerAngle> ROTATION = new EulerAngleType();
+    public static final Type<Vector> VECTOR = new VectorType();
+    public static final Type<CompoundTag> NBT = new NBTType();
+
+    public static final Type<UUID> OPTIONAL_UUID = new OptUUIDType();
+
+    public static final Type<Item> ITEM = new ItemType();
+    public static final Type<Item[]> ITEM_ARRAY = new ItemArrayType();
+    /* Actual Class */
+
+    private final Class<? super T> outputClass;
+    private final String typeName;
+
+    public Type(Class<? super T> outputClass) {
+        this(outputClass.getSimpleName(), outputClass);
+    }
+
+    public Type(String typeName, Class<? super T> outputClass) {
+        this.outputClass = outputClass;
+        this.typeName = typeName;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/TypeConverter.java

@@ -0,0 +1,11 @@
+package us.myles.ViaVersion.api.type;
+
+public interface TypeConverter<T> {
+    /**
+     * Convert from a type to the current type
+     *
+     * @param o The input object
+     * @return The converted type as an object
+     */
+    T from(Object o);
+}

src/main/java/us/myles/ViaVersion/api/type/types/ArrayType.java

@@ -0,0 +1,68 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+
+import java.lang.reflect.Array;
+
+public class ArrayType<T> extends Type<T[]> {
+    private final Type<T> elementType;
+
+    public ArrayType(Type<T> type) {
+        super(type.getTypeName() + " Array", (Class<T[]>) getArrayClass(type.getOutputClass()));
+        this.elementType = type;
+    }
+
+    /* Taken from http://stackoverflow.com/questions/4901128/obtaining-the-array-class-of-a-component-type */
+    public static Class<?> getArrayClass(Class<?> componentType) {
+        ClassLoader classLoader = componentType.getClassLoader();
+        String name;
+        if (componentType.isArray()) {
+            // just add a leading "["
+            name = "[" + componentType.getName();
+        } else if (componentType == boolean.class) {
+            name = "[Z";
+        } else if (componentType == byte.class) {
+            name = "[B";
+        } else if (componentType == char.class) {
+            name = "[C";
+        } else if (componentType == double.class) {
+            name = "[D";
+        } else if (componentType == float.class) {
+            name = "[F";
+        } else if (componentType == int.class) {
+            name = "[I";
+        } else if (componentType == long.class) {
+            name = "[J";
+        } else if (componentType == short.class) {
+            name = "[S";
+        } else {
+            // must be an object non-array class
+            name = "[L" + componentType.getName() + ";";
+        }
+        try {
+            return classLoader != null ? classLoader.loadClass(name) : Class.forName(name);
+        } catch (ClassNotFoundException e) {
+            return null; // oh
+        }
+    }
+
+    @Override
+    public T[] read(ByteBuf buffer) throws Exception {
+        int amount = Type.VAR_INT.read(buffer);
+        T[] array = (T[]) Array.newInstance(elementType.getOutputClass(), amount);
+
+        for (int i = 0; i < amount; i++) {
+            array[i] = elementType.read(buffer);
+        }
+        return array;
+    }
+
+    @Override
+    public void write(ByteBuf buffer, T[] object) throws Exception {
+        Type.VAR_INT.write(buffer, object.length);
+        for (T o : object) {
+            elementType.write(buffer, o);
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/BooleanType.java

@@ -0,0 +1,30 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class BooleanType extends Type<Boolean> implements TypeConverter<Boolean> {
+    public BooleanType() {
+        super(Boolean.class);
+    }
+
+    @Override
+    public Boolean read(ByteBuf buffer) {
+        return buffer.readBoolean();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Boolean object) {
+        buffer.writeBoolean(object);
+    }
+
+
+    @Override
+    public Boolean from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).intValue() == 1;
+        }
+        return (Boolean) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/ByteType.java

@@ -0,0 +1,33 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class ByteType extends Type<Byte> implements TypeConverter<Byte> {
+    public ByteType() {
+        super(Byte.class);
+    }
+
+    @Override
+    public Byte read(ByteBuf buffer) {
+        return buffer.readByte();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Byte object) {
+        buffer.writeByte(object);
+    }
+
+
+    @Override
+    public Byte from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).byteValue();
+        }
+        if (o instanceof Boolean) {
+            return (Boolean) o ? (byte) 1 : 0;
+        }
+        return (Byte) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/DoubleType.java

@@ -0,0 +1,32 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class DoubleType extends Type<Double> implements TypeConverter<Double> {
+    public DoubleType() {
+        super(Double.class);
+    }
+
+    @Override
+    public Double read(ByteBuf buffer) {
+        return buffer.readDouble();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Double object) {
+        buffer.writeDouble(object);
+    }
+
+    @Override
+    public Double from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).doubleValue();
+        }
+        if (o instanceof Boolean) {
+            return (Boolean) o ? (byte) 1D : 0D;
+        }
+        return (Double) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/FloatType.java

@@ -0,0 +1,33 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class FloatType extends Type<Float> implements TypeConverter<Float> {
+    public FloatType() {
+        super(Float.class);
+    }
+
+    @Override
+    public Float read(ByteBuf buffer) {
+        return buffer.readFloat();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Float object) {
+        buffer.writeFloat(object);
+    }
+
+
+    @Override
+    public Float from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).floatValue();
+        }
+        if (o instanceof Boolean) {
+            return ((Boolean) o) ? 1F : 0;
+        }
+        return (Float) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/IntType.java

@@ -0,0 +1,32 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class IntType extends Type<Integer> implements TypeConverter<Integer> {
+    public IntType() {
+        super(Integer.class);
+    }
+
+    @Override
+    public Integer read(ByteBuf buffer) {
+        return buffer.readInt();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Integer object) {
+        buffer.writeInt(object);
+    }
+
+    @Override
+    public Integer from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).intValue();
+        }
+        if (o instanceof Boolean) {
+            return ((Boolean) o) ? 1 : 0;
+        }
+        return (Integer) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/LongType.java

@@ -0,0 +1,33 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class LongType extends Type<Long> implements TypeConverter<Long> {
+    public LongType() {
+        super(Long.class);
+    }
+
+    @Override
+    public Long read(ByteBuf buffer) {
+        return buffer.readLong();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Long object) {
+        buffer.writeLong(object);
+    }
+
+
+    @Override
+    public Long from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).longValue();
+        }
+        if (o instanceof Boolean) {
+            return ((Boolean) o) ? 1L : 0;
+        }
+        return (Long) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/RemainingBytesType.java

@@ -0,0 +1,22 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+
+public class RemainingBytesType extends Type<byte[]> {
+    public RemainingBytesType() {
+        super(byte[].class);
+    }
+
+    @Override
+    public byte[] read(ByteBuf buffer) {
+        byte[] array = new byte[buffer.readableBytes()];
+        buffer.readBytes(array);
+        return array;
+    }
+
+    @Override
+    public void write(ByteBuf buffer, byte[] object) {
+        buffer.writeBytes(object);
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/ShortType.java

@@ -0,0 +1,32 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class ShortType extends Type<Short> implements TypeConverter<Short> {
+    public ShortType() {
+        super(Short.class);
+    }
+
+    @Override
+    public Short read(ByteBuf buffer) {
+        return buffer.readShort();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Short object) {
+        buffer.writeShort(object);
+    }
+
+    @Override
+    public Short from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).shortValue();
+        }
+        if (o instanceof Boolean) {
+            return ((Boolean) o) ? (short) 1 : 0;
+        }
+        return (short) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/StringType.java

@@ -0,0 +1,32 @@
+package us.myles.ViaVersion.api.type.types;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Preconditions;
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+
+public class StringType extends Type<String> {
+    public StringType() {
+        super(String.class);
+    }
+
+    @Override
+    public String read(ByteBuf buffer) throws Exception {
+        int len = Type.VAR_INT.read(buffer);
+        Preconditions.checkArgument(len <= Short.MAX_VALUE, "Cannot receive string longer than Short.MAX_VALUE (got %s characters)", len);
+
+        byte[] b = new byte[len];
+        buffer.readBytes(b);
+
+        return new String(b, Charsets.UTF_8);
+    }
+
+    @Override
+    public void write(ByteBuf buffer, String object) throws Exception {
+        Preconditions.checkArgument(object.length() <= Short.MAX_VALUE, "Cannot send string longer than Short.MAX_VALUE (got %s characters)", object.length());
+
+        byte[] b = object.getBytes(Charsets.UTF_8);
+        Type.VAR_INT.write(buffer, b.length);
+        buffer.writeBytes(b);
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/UUIDType.java

@@ -0,0 +1,23 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+
+import java.util.UUID;
+
+public class UUIDType extends Type<UUID> {
+    public UUIDType() {
+        super(UUID.class);
+    }
+
+    @Override
+    public UUID read(ByteBuf buffer) {
+        return new UUID(buffer.readLong(), buffer.readLong());
+    }
+
+    @Override
+    public void write(ByteBuf buffer, UUID object) {
+        buffer.writeLong(object.getMostSignificantBits());
+        buffer.writeLong(object.getLeastSignificantBits());
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/UnsignedByteType.java

@@ -0,0 +1,32 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class UnsignedByteType extends Type<Short> implements TypeConverter<Short> {
+    public UnsignedByteType() {
+        super(Short.class);
+    }
+
+    @Override
+    public Short read(ByteBuf buffer) {
+        return buffer.readUnsignedByte();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Short object) {
+        buffer.writeByte(object);
+    }
+
+    @Override
+    public Short from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).shortValue();
+        }
+        if (o instanceof Boolean) {
+            return ((Boolean) o) ? (short) 1 : 0;
+        }
+        return (short) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/UnsignedShortType.java

@@ -0,0 +1,32 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class UnsignedShortType extends Type<Integer> implements TypeConverter<Integer> {
+    public UnsignedShortType() {
+        super(Integer.class);
+    }
+
+    @Override
+    public Integer read(ByteBuf buffer) {
+        return buffer.readUnsignedShort();
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Integer object) {
+        buffer.writeShort(object);
+    }
+
+    @Override
+    public Integer from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).intValue();
+        }
+        if (o instanceof Boolean) {
+            return ((Boolean) o) ? 1 : 0;
+        }
+        return (Integer) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/VarIntType.java

@@ -0,0 +1,65 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class VarIntType extends Type<Integer> implements TypeConverter<Integer> {
+
+    public VarIntType() {
+        super("VarInt", Integer.class);
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Integer object) {
+        int part;
+        while (true) {
+            part = object & 0x7F;
+
+            object >>>= 7;
+            if (object != 0) {
+                part |= 0x80;
+            }
+
+            buffer.writeByte(part);
+
+            if (object == 0) {
+                break;
+            }
+        }
+    }
+
+    @Override
+    public Integer read(ByteBuf buffer) {
+        int out = 0;
+        int bytes = 0;
+        byte in;
+        while (true) {
+            in = buffer.readByte();
+
+            out |= (in & 0x7F) << (bytes++ * 7);
+
+            if (bytes > 5) { // 5 is maxBytes
+                throw new RuntimeException("VarInt too big");
+            }
+
+            if ((in & 0x80) != 0x80) {
+                break;
+            }
+        }
+
+        return out;
+    }
+
+
+    @Override
+    public Integer from(Object o) {
+        if (o instanceof Number) {
+            return ((Number) o).intValue();
+        }
+        if (o instanceof Boolean) {
+            return ((Boolean) o) ? 1 : 0;
+        }
+        return (Integer) o;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/VoidType.java

@@ -0,0 +1,26 @@
+package us.myles.ViaVersion.api.type.types;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.TypeConverter;
+
+public class VoidType extends Type<Void> implements TypeConverter<Void> {
+    public VoidType() {
+        super(Void.class);
+    }
+
+    @Override
+    public Void read(ByteBuf buffer) {
+        return null;
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Void object) {
+
+    }
+
+    @Override
+    public Void from(Object o) {
+        return null;
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/minecraft/EulerAngleType.java

@@ -0,0 +1,27 @@
+package us.myles.ViaVersion.api.type.types.minecraft;
+
+import io.netty.buffer.ByteBuf;
+import org.bukkit.util.EulerAngle;
+import us.myles.ViaVersion.api.type.Type;
+
+public class EulerAngleType extends Type<EulerAngle> {
+    public EulerAngleType() {
+        super(EulerAngle.class);
+    }
+
+    @Override
+    public EulerAngle read(ByteBuf buffer) throws Exception {
+        float x = Type.FLOAT.read(buffer);
+        float y = Type.FLOAT.read(buffer);
+        float z = Type.FLOAT.read(buffer);
+
+        return new EulerAngle(x, y, z);
+    }
+
+    @Override
+    public void write(ByteBuf buffer, EulerAngle object) throws Exception {
+        Type.FLOAT.write(buffer, (float) object.getX());
+        Type.FLOAT.write(buffer, (float) object.getY());
+        Type.FLOAT.write(buffer, (float) object.getZ());
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/minecraft/ItemArrayType.java

@@ -0,0 +1,30 @@
+package us.myles.ViaVersion.api.type.types.minecraft;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.type.Type;
+
+public class ItemArrayType extends Type<Item[]> {
+
+    public ItemArrayType() {
+        super("Item Array", Item[].class);
+    }
+
+    @Override
+    public Item[] read(ByteBuf buffer) throws Exception {
+        int amount = Type.SHORT.read(buffer);
+        Item[] array = new Item[amount];
+        for (int i = 0; i < amount; i++) {
+            array[i] = Type.ITEM.read(buffer);
+        }
+        return array;
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Item[] object) throws Exception {
+        Type.SHORT.write(buffer, (short) object.length);
+        for (Item o : object) {
+            Type.ITEM.write(buffer, o);
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/minecraft/ItemType.java

@@ -0,0 +1,38 @@
+package us.myles.ViaVersion.api.type.types.minecraft;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.type.Type;
+
+public class ItemType extends Type<Item> {
+    public ItemType() {
+        super(Item.class);
+    }
+
+    @Override
+    public Item read(ByteBuf buffer) throws Exception {
+        short id = buffer.readShort();
+        if (id < 0) {
+            return null;
+        } else {
+            Item item = new Item();
+            item.setId(id);
+            item.setAmount(buffer.readByte());
+            item.setData(buffer.readShort());
+            item.setTag(Type.NBT.read(buffer));
+            return item;
+        }
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Item object) throws Exception {
+        if (object == null) {
+            buffer.writeShort(-1);
+        } else {
+            buffer.writeShort(object.getId());
+            buffer.writeByte(object.getAmount());
+            buffer.writeShort(object.getData());
+            Type.NBT.write(buffer, object.getTag());
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/minecraft/NBTType.java

@@ -0,0 +1,49 @@
+package us.myles.ViaVersion.api.type.types.minecraft;
+
+import com.google.common.base.Preconditions;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+import org.spacehq.opennbt.NBTIO;
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
+import us.myles.ViaVersion.api.type.Type;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+
+public class NBTType extends Type<CompoundTag> {
+    public NBTType() {
+        super(CompoundTag.class);
+    }
+
+    @Override
+    public CompoundTag read(ByteBuf buffer) throws Exception {
+        Preconditions.checkArgument(buffer.readableBytes() <= 2097152, "Cannot read NBT (got %s bytes)", buffer.readableBytes());
+
+        int readerIndex = buffer.readerIndex();
+        byte b = buffer.readByte();
+        if (b == 0) {
+            return null;
+        } else {
+            buffer.readerIndex(readerIndex);
+            ByteBufInputStream bytebufStream = new ByteBufInputStream(buffer);
+            try (DataInputStream dataInputStream = new DataInputStream(bytebufStream)) {
+                return (CompoundTag) NBTIO.readTag(dataInputStream);
+            }
+        }
+    }
+
+    @Override
+    public void write(ByteBuf buffer, CompoundTag object) throws Exception {
+        if (object == null) {
+            buffer.writeByte(0);
+        } else {
+            ByteBufOutputStream bytebufStream = new ByteBufOutputStream(buffer);
+            DataOutputStream dataOutputStream = new DataOutputStream(bytebufStream);
+
+            NBTIO.writeTag(dataOutputStream, object);
+
+            dataOutputStream.close();
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/minecraft/OptUUIDType.java

@@ -0,0 +1,30 @@
+package us.myles.ViaVersion.api.type.types.minecraft;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.type.Type;
+
+import java.util.UUID;
+
+public class OptUUIDType extends Type<UUID> {
+    public OptUUIDType() {
+        super(UUID.class);
+    }
+
+    @Override
+    public UUID read(ByteBuf buffer) {
+        boolean present = buffer.readBoolean();
+        if (!present) return null;
+        return new UUID(buffer.readLong(), buffer.readLong());
+    }
+
+    @Override
+    public void write(ByteBuf buffer, UUID object) {
+        if (object == null) {
+            buffer.writeBoolean(false);
+        } else {
+            buffer.writeBoolean(true);
+            buffer.writeLong(object.getMostSignificantBits());
+            buffer.writeLong(object.getLeastSignificantBits());
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/minecraft/PositionType.java

@@ -0,0 +1,27 @@
+package us.myles.ViaVersion.api.type.types.minecraft;
+
+import io.netty.buffer.ByteBuf;
+import us.myles.ViaVersion.api.minecraft.Position;
+import us.myles.ViaVersion.api.type.Type;
+
+public class PositionType extends Type<Position> {
+    public PositionType() {
+        super(Position.class);
+    }
+
+    @Override
+    public Position read(ByteBuf buffer) {
+        long val = buffer.readLong();
+        long x = (val >> 38); // signed
+        long y = (val >> 26) & 0xfff; // unsigned
+        // this shifting madness is used to preserve sign
+        long z = (val << 38) >> 38; // signed
+
+        return new Position(x, y, z);
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Position object) {
+        buffer.writeLong(((object.getX() & 0x3ffffff) << 38) | ((object.getY() & 0xfff) << 26) | (object.getZ() & 0x3ffffff));
+    }
+}

src/main/java/us/myles/ViaVersion/api/type/types/minecraft/VectorType.java

@@ -0,0 +1,27 @@
+package us.myles.ViaVersion.api.type.types.minecraft;
+
+import io.netty.buffer.ByteBuf;
+import org.bukkit.util.Vector;
+import us.myles.ViaVersion.api.type.Type;
+
+public class VectorType extends Type<Vector> {
+    public VectorType() {
+        super(Vector.class);
+    }
+
+    @Override
+    public Vector read(ByteBuf buffer) throws Exception {
+        int x = Type.INT.read(buffer);
+        int y = Type.INT.read(buffer);
+        int z = Type.INT.read(buffer);
+
+        return new Vector(x, y, z);
+    }
+
+    @Override
+    public void write(ByteBuf buffer, Vector object) throws Exception {
+        Type.INT.write(buffer, object.getBlockX());
+        Type.INT.write(buffer, object.getBlockY());
+        Type.INT.write(buffer, object.getBlockZ());
+    }
+}

src/main/java/us/myles/ViaVersion/boss/ViaBossBar.java

@@ -11,14 +11,11 @@ import us.myles.ViaVersion.api.boss.BossBar;
 import us.myles.ViaVersion.api.boss.BossColor;
 import us.myles.ViaVersion.api.boss.BossFlag;
 import us.myles.ViaVersion.api.boss.BossStyle;
-import us.myles.ViaVersion.packets.PacketType;
-import us.myles.ViaVersion.transformers.OutgoingTransformer;
-import us.myles.ViaVersion.util.PacketUtil;
+import us.myles.ViaVersion.api.protocol.ProtocolVersion;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 @Getter
 public class ViaBossBar implements BossBar {
@@ -45,17 +42,19 @@ public class ViaBossBar implements BossBar {
     }
 
     @Override
-    public void setTitle(String title) {
+    public BossBar setTitle(String title) {
         Validate.notNull(title, "Title cannot be null");
         this.title = title;
         sendPacket(UpdateAction.UPDATE_TITLE);
+        return this;
     }
 
     @Override
-    public void setHealth(float health) {
+    public BossBar setHealth(float health) {
         Validate.isTrue((health >= 0 && health <= 1), "Health must be between 0 and 1");
         this.health = health;
         sendPacket(UpdateAction.UPDATE_HEALTH);
+        return this;
     }
 
     @Override
@@ -64,48 +63,54 @@ public class ViaBossBar implements BossBar {
     }
 
     @Override
-    public void setColor(BossColor color) {
+    public BossBar setColor(BossColor color) {
         Validate.notNull(color, "Color cannot be null");
         this.color = color;
         sendPacket(UpdateAction.UPDATE_STYLE);
+        return this;
     }
 
     @Override
-    public void setStyle(BossStyle style) {
+    public BossBar setStyle(BossStyle style) {
         Validate.notNull(style, "Style cannot be null");
         this.style = style;
         sendPacket(UpdateAction.UPDATE_STYLE);
+        return this;
     }
 
     @Override
-    public void addPlayer(Player player) {
+    public BossBar addPlayer(Player player) {
         if (player != null && !players.contains(player.getUniqueId())) {
             players.add(player.getUniqueId());
             if (visible)
                 sendPacket(player.getUniqueId(), getPacket(UpdateAction.ADD));
         }
+        return this;
     }
 
     @Override
-    public void removePlayer(Player player) {
+    public BossBar removePlayer(Player player) {
         if (player != null && players.contains(player.getUniqueId())) {
             players.remove(player.getUniqueId());
             sendPacket(player.getUniqueId(), getPacket(UpdateAction.REMOVE));
         }
+        return this;
     }
 
     @Override
-    public void addFlag(BossFlag flag) {
+    public BossBar addFlag(BossFlag flag) {
         if (!hasFlag(flag))
             flags.add(flag);
         sendPacket(UpdateAction.UPDATE_FLAGS);
+        return this;
     }
 
     @Override
-    public void removeFlag(BossFlag flag) {
+    public BossBar removeFlag(BossFlag flag) {
         if (hasFlag(flag))
             flags.remove(flag);
         sendPacket(UpdateAction.UPDATE_FLAGS);
+        return this;
     }
 
     @Override
@@ -119,13 +124,15 @@ public class ViaBossBar implements BossBar {
     }
 
     @Override
-    public void show() {
+    public BossBar show() {
         setVisible(true);
+        return this;
     }
 
     @Override
-    public void hide() {
+    public BossBar hide() {
         setVisible(false);
+        return this;
     }
 
     @Override
@@ -142,12 +149,12 @@ public class ViaBossBar implements BossBar {
 
     private void sendPacket(UpdateAction action) {
         ByteBuf buf = getPacket(action);
-        for (UUID uuid : players)
+        for (UUID uuid : new ArrayList<>(players))
             sendPacket(uuid, buf);
     }
 
     private void sendPacket(UUID uuid, ByteBuf buf) {
-        if (!ViaVersion.getInstance().isPorted(uuid)) {
+        if (!ViaVersion.getInstance().isPorted(uuid) || !(ViaVersion.getInstance().getPlayerVersion(uuid) >= ProtocolVersion.V1_9)) {
             players.remove(uuid);
             return;
         }
@@ -155,36 +162,41 @@ public class ViaBossBar implements BossBar {
     }
 
     private ByteBuf getPacket(UpdateAction action) {
-        ByteBuf buf = Unpooled.buffer();
-        PacketUtil.writeVarInt(PacketType.PLAY_BOSS_BAR.getNewPacketID(), buf);
-        PacketUtil.writeUUID(uuid, buf);
-        PacketUtil.writeVarInt(action.getId(), buf);
-        switch (action) {
-            case ADD:
-                PacketUtil.writeString(fixJson(title), buf);
-                buf.writeFloat(health);
-                PacketUtil.writeVarInt(color.getId(), buf);
-                PacketUtil.writeVarInt(style.getId(), buf);
-                buf.writeByte(flagToBytes());
-                break;
-            case REMOVE:
-                break;
-            case UPDATE_HEALTH:
-                buf.writeFloat(health);
-                break;
-            case UPDATE_TITLE:
-                PacketUtil.writeString(fixJson(title), buf);
-                break;
-            case UPDATE_STYLE:
-                PacketUtil.writeVarInt(color.getId(), buf);
-                PacketUtil.writeVarInt(style.getId(), buf);
-                break;
-            case UPDATE_FLAGS:
-                buf.writeByte(flagToBytes());
-                break;
-        }
+        try {
+            ByteBuf buf = Unpooled.buffer();
+            Type.VAR_INT.write(buf, 0x0C); // Boss bar packet
+            Type.UUID.write(buf, uuid);
+            Type.VAR_INT.write(buf, action.getId());
+            switch (action) {
+                case ADD:
+                    Type.STRING.write(buf, fixJson(title));
+                    buf.writeFloat(health);
+                    Type.VAR_INT.write(buf, color.getId());
+                    Type.VAR_INT.write(buf, style.getId());
+                    buf.writeByte(flagToBytes());
+                    break;
+                case REMOVE:
+                    break;
+                case UPDATE_HEALTH:
+                    buf.writeFloat(health);
+                    break;
+                case UPDATE_TITLE:
+                    Type.STRING.write(buf, fixJson(title));
+                    break;
+                case UPDATE_STYLE:
+                    Type.VAR_INT.write(buf, color.getId());
+                    Type.VAR_INT.write(buf, style.getId());
+                    break;
+                case UPDATE_FLAGS:
+                    buf.writeByte(flagToBytes());
+                    break;
+            }
 
-        return buf;
+            return buf;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
     }
 
     private int flagToBytes() {
@@ -195,7 +207,7 @@ public class ViaBossBar implements BossBar {
     }
 
     private String fixJson(String text) {
-        return OutgoingTransformer.fixJson(text);
+        return Protocol1_9TO1_8.fixJson(text);
     }
 
     @RequiredArgsConstructor

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

@@ -1,5 +1,6 @@
 package us.myles.ViaVersion.commands;
 
+import io.netty.util.ResourceLeakDetector;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -12,9 +13,6 @@ import us.myles.ViaVersion.api.ViaVersion;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created by fillefilip8 on 2016-03-03.
- */
 @RequiredArgsConstructor
 public class ViaVersionCommand implements CommandExecutor {
 
@@ -42,13 +40,20 @@ public class ViaVersionCommand implements CommandExecutor {
                 } else if (args[0].equalsIgnoreCase("debug")) {
                     plugin.setDebug(!plugin.isDebug());
                     sender.sendMessage(color("&6Debug mode is now " + (plugin.isDebug() ? "&aenabled" : "&cdisabled")));
+                } else if (args[0].equalsIgnoreCase("displayleaks")) {
+                    if (ResourceLeakDetector.getLevel() != ResourceLeakDetector.Level.ADVANCED) {
+                        ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.ADVANCED);
+                    } else {
+                        ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED);
+                    }
+                    sender.sendMessage(color("&6Leak detector is now " + (ResourceLeakDetector.getLevel() == ResourceLeakDetector.Level.ADVANCED ? "&aenabled" : "&cdisabled")));
                 } else if (args[0].equalsIgnoreCase("dontbugme")) {
-                    boolean newValue = !plugin.getConfig().getBoolean("checkforupdates", true);
+                    boolean newValue = !plugin.isCheckForUpdates();
                     plugin.getConfig().set("checkforupdates", newValue);
                     plugin.saveConfig();
                     sender.sendMessage(color("&6We will " + (newValue ? "&anotify you about updates." : "&cnot tell you about updates.")));
                 } else if (args[0].equalsIgnoreCase("autoteam")) {
-                    boolean newValue = !plugin.getConfig().getBoolean("auto-team", true);
+                    boolean newValue = !plugin.isAutoTeam();
                     plugin.getConfig().set("auto-team", newValue);
                     plugin.saveConfig();
                     sender.sendMessage(color("&6We will " + (newValue ? "&aautomatically team players" : "&cno longer auto team players")));
@@ -62,7 +67,7 @@ public class ViaVersionCommand implements CommandExecutor {
         return false;
     }
 
-    public void sendHelp(CommandSender sender){
+    public void sendHelp(CommandSender sender) {
         sender.sendMessage(color("&aViaVersion &c" + ViaVersion.getInstance().getVersion()));
         sender.sendMessage(color("&6Commands:"));
         sender.sendMessage(color("&2/viaversion list &7- &6Shows lists of all 1.9 clients and 1.8 clients."));

src/main/java/us/myles/ViaVersion/exception/CancelException.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion;
+package us.myles.ViaVersion.exception;
 
 public class CancelException extends Exception {
 }

src/main/java/us/myles/ViaVersion/exception/InformativeException.java

@@ -0,0 +1,50 @@
+package us.myles.ViaVersion.exception;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class InformativeException extends Exception {
+    Map<String, Object> info = new HashMap<>();
+    int sources = 0;
+
+    public InformativeException(Throwable cause) {
+        super(cause);
+    }
+
+    public InformativeException set(String key, Object value) {
+        info.put(key, value);
+        return this;
+    }
+
+    public InformativeException addSource(Class<?> sourceClazz) {
+        return set("Source #" + sources++, getSource(sourceClazz));
+    }
+
+    private String getSource(Class<?> sourceClazz) {
+        if(sourceClazz.isAnonymousClass()){
+            return sourceClazz.getName() + " (Anonymous)";
+        }else{
+            return sourceClazz.getName();
+        }
+    }
+
+    @Override
+    public String getMessage() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Please post this error to http://github.com/MylesIsCool/ViaVersion/issues\n{");
+        int i = 0;
+        for (Map.Entry<String, Object> entry : info.entrySet()) {
+            builder.append((i == 0 ? "" : ", ") + entry.getKey() + ": " + entry.getValue().toString());
+            i++;
+        }
+        builder.append("}\nActual Error: ");
+
+        return builder.toString();
+    }
+
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+        // Don't record this stack
+        return this;
+    }
+}

src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java

@@ -3,23 +3,26 @@ package us.myles.ViaVersion.handlers;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
-import us.myles.ViaVersion.CancelException;
-import us.myles.ViaVersion.ConnectionInfo;
-import us.myles.ViaVersion.transformers.IncomingTransformer;
-import us.myles.ViaVersion.util.PacketUtil;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.exception.CancelException;
+import us.myles.ViaVersion.packets.Direction;
+import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+import us.myles.ViaVersion.util.PipelineUtil;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 public class ViaDecodeHandler extends ByteToMessageDecoder {
 
-    private final IncomingTransformer incomingTransformer;
     private final ByteToMessageDecoder minecraftDecoder;
-    private final ConnectionInfo info;
+    private final UserConnection info;
+    public static int PASSTHROUGH_ID = 1000;
 
-    public ViaDecodeHandler(ConnectionInfo info, ByteToMessageDecoder minecraftDecoder) {
+    public ViaDecodeHandler(UserConnection info, ByteToMessageDecoder minecraftDecoder) {
         this.info = info;
         this.minecraftDecoder = minecraftDecoder;
-        this.incomingTransformer = new IncomingTransformer(info);
     }
 
     @Override
@@ -27,26 +30,50 @@ public class ViaDecodeHandler extends ByteToMessageDecoder {
         // use transformers
         if (bytebuf.readableBytes() > 0) {
             if (info.isActive()) {
-                int id = PacketUtil.readVarInt(bytebuf);
+                // Increment received
+                info.incrementReceived();
+                // Handle ID
+                int id = Type.VAR_INT.read(bytebuf);
                 // Transform
                 ByteBuf newPacket = ctx.alloc().buffer();
                 try {
-                    incomingTransformer.transform(id, bytebuf, newPacket);
+                    if (id == ViaDecodeHandler.PASSTHROUGH_ID) {
+                        newPacket.writeBytes(bytebuf);
+                    } else {
+                        PacketWrapper wrapper = new PacketWrapper(id, bytebuf, info);
+                        ProtocolInfo protInfo = info.get(ProtocolInfo.class);
+                        protInfo.getPipeline().transform(Direction.INCOMING, protInfo.getState(), wrapper);
+                        wrapper.writeToBuffer(newPacket);
+                    }
+
                     bytebuf.clear();
                     bytebuf = newPacket;
                 } catch (Exception e) {
+                    // Clear Buffer
                     bytebuf.clear();
+                    // Release Packet, be free!
+                    newPacket.release();
                     throw e;
                 }
             }
             // call minecraft decoder
-            list.addAll(PacketUtil.callDecode(this.minecraftDecoder, ctx, bytebuf));
+            try {
+                list.addAll(PipelineUtil.callDecode(this.minecraftDecoder, ctx, bytebuf));
+            } catch (InvocationTargetException e) {
+                if (e.getCause() instanceof Exception) {
+                    throw (Exception) e.getCause();
+                }
+            } finally {
+                if (info.isActive()) {
+                    bytebuf.release();
+                }
+            }
         }
     }
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        if (PacketUtil.containsCause(cause, CancelException.class)) return;
+        if (PipelineUtil.containsCause(cause, CancelException.class)) return;
         super.exceptionCaught(ctx, cause);
     }
 }

src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java

@@ -3,24 +3,23 @@ package us.myles.ViaVersion.handlers;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import us.myles.ViaVersion.CancelException;
-import us.myles.ViaVersion.ConnectionInfo;
-import us.myles.ViaVersion.transformers.OutgoingTransformer;
-import us.myles.ViaVersion.util.PacketUtil;
-import us.myles.ViaVersion.util.ReflectionUtil;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.exception.CancelException;
+import us.myles.ViaVersion.packets.Direction;
+import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+import us.myles.ViaVersion.util.PipelineUtil;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
 public class ViaEncodeHandler extends MessageToByteEncoder {
-    private final ConnectionInfo info;
+    private final UserConnection info;
     private final MessageToByteEncoder minecraftEncoder;
-    private final OutgoingTransformer outgoingTransformer;
 
-    public ViaEncodeHandler(ConnectionInfo info, MessageToByteEncoder minecraftEncoder) {
+    public ViaEncodeHandler(UserConnection info, MessageToByteEncoder minecraftEncoder) {
         this.info = info;
         this.minecraftEncoder = minecraftEncoder;
-        this.outgoingTransformer = new OutgoingTransformer(info);
     }
 
 
@@ -28,51 +27,32 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
     protected void encode(final ChannelHandlerContext ctx, Object o, final ByteBuf bytebuf) throws Exception {
         // handle the packet type
         if (!(o instanceof ByteBuf)) {
-            info.setLastPacket(o);
-            /* This transformer is more for fixing issues which we find hard at packet level :) */
-            if (o.getClass().getName().endsWith("PacketPlayOutMapChunkBulk") && info.isActive()) {
-                final int[] locX = ReflectionUtil.get(o, "a", int[].class);
-                final int[] locZ = ReflectionUtil.get(o, "b", int[].class);
-
-                final Object world = ReflectionUtil.get(o, "world", ReflectionUtil.nms("World"));
-                Class<?> mapChunk = ReflectionUtil.nms("PacketPlayOutMapChunk");
-                final Constructor constructor = mapChunk.getDeclaredConstructor(ReflectionUtil.nms("Chunk"), boolean.class, int.class);
-                Runnable chunks = new Runnable() {
-
-                    @Override
-                    public void run() {
-
-                        for (int i = 0; i < locX.length; i++) {
-                            int x = locX[i];
-                            int z = locZ[i];
-                            // world invoke function
-                            try {
-                                Object chunk = ReflectionUtil.nms("World").getDeclaredMethod("getChunkAt", int.class, int.class).invoke(world, x, z);
-                                Object packet = constructor.newInstance(chunk, true, 65535);
-                                ctx.pipeline().writeAndFlush(packet);
-                            } catch (InstantiationException | InvocationTargetException | ClassNotFoundException | IllegalAccessException | NoSuchMethodException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-                };
-                chunks.run();
-                bytebuf.clear();
-                throw new CancelException();
-            }
             // call minecraft encoder
-            PacketUtil.callEncode(this.minecraftEncoder, ctx, o, bytebuf);
+            try {
+                PipelineUtil.callEncode(this.minecraftEncoder, ctx, o, bytebuf);
+            } catch (InvocationTargetException e) {
+                if (e.getCause() instanceof Exception) {
+                    throw (Exception) e.getCause();
+                }
+            }
         }
         if (bytebuf.readableBytes() == 0) {
             throw new CancelException();
         }
         if (info.isActive()) {
-            int id = PacketUtil.readVarInt(bytebuf);
+            // Increment sent
+            info.incrementSent();
+            // Handle ID
+            int id = Type.VAR_INT.read(bytebuf);
             // Transform
             ByteBuf oldPacket = bytebuf.copy();
             bytebuf.clear();
+
             try {
-                outgoingTransformer.transform(id, oldPacket, bytebuf);
+                    PacketWrapper wrapper = new PacketWrapper(id, oldPacket, info);
+                    ProtocolInfo protInfo = info.get(ProtocolInfo.class);
+                    protInfo.getPipeline().transform(Direction.OUTGOING, protInfo.getState(), wrapper);
+                    wrapper.writeToBuffer(bytebuf);
             } catch (Exception e) {
                 bytebuf.clear();
                 throw e;
@@ -84,7 +64,7 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        if (PacketUtil.containsCause(cause, CancelException.class)) return;
+        if (PipelineUtil.containsCause(cause, CancelException.class)) return;
         super.exceptionCaught(ctx, cause);
     }
 }

src/main/java/us/myles/ViaVersion/handlers/ViaPacketHandler.java

@@ -0,0 +1,35 @@
+package us.myles.ViaVersion.handlers;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageEncoder;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+
+import java.util.List;
+
+public class ViaPacketHandler extends MessageToMessageEncoder {
+    private final UserConnection info;
+
+    public ViaPacketHandler(UserConnection info) {
+        this.info = info;
+    }
+
+    @Override
+    protected void encode(ChannelHandlerContext ctx, Object o, List list) throws Exception {
+        // Split chunk bulk packet up in to single chunk packets before it reached the encoder.
+        // This will prevent issues with several plugins and other protocol handlers due to the chunk being sent twice.
+        // It also sends the chunk in the right order possible resolving some issues with added chunk/block/entity data.
+        if (!(o instanceof ByteBuf)) {
+            info.setLastPacket(o);
+            /* This transformer is more for fixing issues which we find hard at packet level :) */
+            if (info.isActive()) {
+                if (info.get(ProtocolInfo.class).getPipeline().filter(o, list)) {
+                    return;
+                }
+            }
+        }
+
+        list.add(o);
+    }
+}

src/main/java/us/myles/ViaVersion/handlers/ViaVersionInitializer.java

@@ -5,7 +5,8 @@ import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
-import us.myles.ViaVersion.ConnectionInfo;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
 
 import java.lang.reflect.Method;
 
@@ -26,14 +27,18 @@ public class ViaVersionInitializer extends ChannelInitializer<SocketChannel> {
 
     @Override
     protected void initChannel(SocketChannel socketChannel) throws Exception {
-        ConnectionInfo info = new ConnectionInfo(socketChannel);
+        UserConnection info = new UserConnection(socketChannel);
+        // init protocol
+        new ProtocolPipeline(info);
         // Add originals
         this.method.invoke(this.oldInit, socketChannel);
         // Add our transformers
         ViaEncodeHandler encoder = new ViaEncodeHandler(info, (MessageToByteEncoder) socketChannel.pipeline().get("encoder"));
         ViaDecodeHandler decoder = new ViaDecodeHandler(info, (ByteToMessageDecoder) socketChannel.pipeline().get("decoder"));
+        ViaPacketHandler chunkHandler = new ViaPacketHandler(info);
 
         socketChannel.pipeline().replace("encoder", "encoder", encoder);
         socketChannel.pipeline().replace("decoder", "decoder", decoder);
+        socketChannel.pipeline().addAfter("packet_handler", "viaversion_packet_handler", chunkHandler);
     }
 }

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

@@ -1,62 +0,0 @@
-package us.myles.ViaVersion.listeners;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import lombok.RequiredArgsConstructor;
-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.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import us.myles.ViaVersion.ViaVersionPlugin;
-import us.myles.ViaVersion.packets.PacketType;
-import us.myles.ViaVersion.util.PacketUtil;
-import us.myles.ViaVersion.util.ReflectionUtil;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-@RequiredArgsConstructor
-public class CommandBlockListener implements Listener {
-
-    private final ViaVersionPlugin plugin;
-
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
-    public void onJoin(final PlayerJoinEvent e) {
-        if (e.getPlayer().isOp() && plugin.isPorted(e.getPlayer())) {
-            ByteBuf buf = Unpooled.buffer();
-            PacketUtil.writeVarInt(PacketType.PLAY_ENTITY_STATUS.getNewPacketID(), buf);
-            buf.writeInt(e.getPlayer().getEntityId());
-            buf.writeByte(26);
-            plugin.sendRawPacket(e.getPlayer(), buf);
-        }
-    }
-
-    @EventHandler(ignoreCancelled = true)
-    public void onInteract(PlayerInteractEvent e) {
-        if (e.getAction() == Action.RIGHT_CLICK_BLOCK && plugin.isPorted(e.getPlayer()) && e.getPlayer().isOp()) {
-            try {
-                sendCommandBlockPacket(e.getClickedBlock(), e.getPlayer());
-            } catch (NoSuchFieldException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | ClassNotFoundException e1) {
-                e1.printStackTrace();
-            }
-        }
-    }
-
-    private void sendCommandBlockPacket(Block b, Player player) throws NoSuchFieldException, IllegalAccessException, NoSuchMethodException, InvocationTargetException, ClassNotFoundException {
-        if (!(b.getState() instanceof CommandBlock))
-            return;
-        CommandBlock cmd = (CommandBlock) b.getState();
-
-        Object tileEntityCommand = ReflectionUtil.get(cmd, "commandBlock", ReflectionUtil.nms("TileEntityCommand"));
-        Object updatePacket = ReflectionUtil.invoke(tileEntityCommand, "getUpdatePacket");
-        Object nmsPlayer = ReflectionUtil.invoke(player, "getHandle");
-        Object playerConnection = ReflectionUtil.get(nmsPlayer, "playerConnection", ReflectionUtil.nms("PlayerConnection"));
-        Method sendPacket = playerConnection.getClass().getMethod("sendPacket", ReflectionUtil.nms("Packet"));
-        sendPacket.invoke(playerConnection, updatePacket); //Let the transformer do the work
-    }
-}

src/main/java/us/myles/ViaVersion/metadata/MetadataRewriter.java

@@ -1,216 +0,0 @@
-package us.myles.ViaVersion.metadata;
-
-import io.netty.buffer.ByteBuf;
-import lombok.Getter;
-import lombok.Setter;
-import org.bukkit.entity.EntityType;
-import org.bukkit.util.EulerAngle;
-import org.bukkit.util.Vector;
-import us.myles.ViaVersion.ViaVersionPlugin;
-import us.myles.ViaVersion.api.ViaVersion;
-import us.myles.ViaVersion.slot.ItemSlotRewriter;
-import us.myles.ViaVersion.slot.ItemSlotRewriter.ItemStack;
-import us.myles.ViaVersion.transformers.OutgoingTransformer;
-import us.myles.ViaVersion.util.PacketUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-public class MetadataRewriter {
-
-    public static void writeMetadata1_9(EntityType type, List<Entry> list, ByteBuf output) {
-        short id = -1;
-        int data = -1;
-        for (Entry entry : list) {
-            MetaIndex metaIndex = entry.index;
-            try {
-                if (metaIndex.getNewType() != NewType.Discontinued) {
-                    if (metaIndex.getNewType() != NewType.BlockID || id != -1 && data == -1 || id == -1 && data != -1) { // block ID is only written if we have both parts
-                        output.writeByte(metaIndex.getNewIndex());
-                        output.writeByte(metaIndex.getNewType().getTypeID());
-                    }
-                    Object value = entry.value;
-                    switch (metaIndex.getNewType()) {
-                        case Byte:
-                            // convert from int, byte
-                            if (metaIndex.getOldType() == Type.Byte) {
-                                output.writeByte((Byte) value);
-                            }
-                            if (metaIndex.getOldType() == Type.Int) {
-                                output.writeByte(((Integer) value).byteValue());
-                            }
-                            // After writing the last one
-                            if (metaIndex == MetaIndex.ENTITY_STATUS && type == EntityType.PLAYER) {
-                                output.writeByte(MetaIndex.PLAYER_HAND.getNewIndex());
-                                output.writeByte(MetaIndex.PLAYER_HAND.getNewType().getTypeID());
-                                if ((((Byte) value) & 0x10) == 0x10) { // Player eating/aiming/drinking
-                                    output.writeByte(1); // Using main hand
-                                } else {
-                                    output.writeByte(0); // Not using any hand to stop animation
-                                }
-                            }
-                            break;
-                        case OptUUID:
-                            String owner = (String) value;
-                            UUID toWrite = null;
-                            if (owner.length() != 0) {
-                                try {
-                                    toWrite = UUID.fromString(owner);
-                                } catch (Exception ignored) {
-                                }
-                            }
-                            output.writeBoolean(toWrite != null);
-                            if (toWrite != null)
-                                PacketUtil.writeUUID(toWrite, output);
-                            break;
-                        case BlockID:
-                            // if we have both sources :))
-                            if (metaIndex.getOldType() == Type.Byte) {
-                                data = (Byte) value;
-                            }
-                            if (metaIndex.getOldType() == Type.Short) {
-                                id = (Short) value;
-                            }
-                            if (id != -1 && data != -1) {
-                                int combined = id << 4 | data;
-                                data = -1;
-                                id = -1;
-                                PacketUtil.writeVarInt(combined, output);
-                            }
-                            break;
-                        case VarInt:
-                            // convert from int, short, byte
-                            if (metaIndex.getOldType() == Type.Byte) {
-                                PacketUtil.writeVarInt(((Byte) value).intValue(), output);
-                            }
-                            if (metaIndex.getOldType() == Type.Short) {
-                                PacketUtil.writeVarInt(((Short) value).intValue(), output);
-                            }
-                            if (metaIndex.getOldType() == Type.Int) {
-                                PacketUtil.writeVarInt((Integer) value, output);
-                            }
-                            break;
-                        case Float:
-                            output.writeFloat((Float) value);
-                            break;
-                        case String:
-                            PacketUtil.writeString((String) value, output);
-                            break;
-                        case Boolean:
-                            if (metaIndex == MetaIndex.AGEABLE_AGE)
-                                output.writeBoolean((Byte) value < 0);
-                            else
-                                output.writeBoolean((Byte) value != 0);
-                            break;
-                        case Slot:
-                            ItemStack item = (ItemStack) value;
-                            ItemSlotRewriter.fixIdsFrom1_8To1_9(item);
-                            ItemSlotRewriter.writeItemStack(item, output);
-                            break;
-                        case Position:
-                            Vector vector = (Vector) value;
-                            output.writeInt((int) vector.getX());
-                            output.writeInt((int) vector.getY());
-                            output.writeInt((int) vector.getZ());
-                            break;
-                        case Vector3F:
-                            EulerAngle angle = (EulerAngle) value;
-                            output.writeFloat((float) angle.getX());
-                            output.writeFloat((float) angle.getY());
-                            output.writeFloat((float) angle.getZ());
-                            break;
-                        case Chat:
-                            PacketUtil.writeString(OutgoingTransformer.fixJson((String) value), output);
-                            break;
-                        default:
-                            System.out.println("[Out] Unhandled MetaDataType: " + metaIndex.getNewType());
-                            break;
-                    }
-                }
-            } catch (Exception e) {
-                if (!((ViaVersionPlugin) ViaVersion.getInstance()).isSuppressMetadataErrors()) {
-                    System.out.println("INCLUDE THIS IN YOUR ERROR LOG!");
-                    if (type != null)
-                        System.out.println("An error occurred with entity meta data for " + type + " OldID: " + entry.oldID);
-                    else
-                        System.out.println("An error occurred with entity meta data for UNKNOWN_ENTITY OldID: " + entry.oldID);
-                    if (metaIndex != null) {
-                        System.out.println("Old ID: " + metaIndex.getIndex() + " New ID: " + metaIndex.getNewIndex());
-                        System.out.println("Old Type: " + metaIndex.getOldType() + " New Type: " + metaIndex.getNewType());
-                    }
-                    e.printStackTrace();
-                }
-            }
-        }
-        output.writeByte(255);
-    }
-
-    public static List<Entry> readMetadata1_8(EntityType entityType, ByteBuf buf) {
-        List<Entry> entries = new ArrayList<>();
-        byte item;
-        while ((item = buf.readByte()) != 127) {
-            Type type = Type.byId((item & 0xE0) >> 5);
-            int id = item & 0x1F;
-            MetaIndex index = MetaIndex.getIndex(entityType, id);
-            switch (type) {
-                case Byte:
-                    entries.add(new Entry(index, buf.readByte(), id));
-                    break;
-                case Short:
-                    entries.add(new Entry(index, buf.readShort(), id));
-                    break;
-                case Int:
-                    entries.add(new Entry(index, buf.readInt(), id));
-                    break;
-                case Float:
-                    entries.add(new Entry(index, buf.readFloat(), id));
-                    break;
-                case String:
-                    entries.add(new Entry(index, PacketUtil.readString(buf), id));
-                    break;
-                case Slot: {
-                    try {
-                        entries.add(new Entry(index, ItemSlotRewriter.readItemStack(buf), id));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-                break;
-                case Position: {
-                    int x = buf.readInt();
-                    int y = buf.readInt();
-                    int z = buf.readInt();
-                    entries.add(new Entry(index, new Vector(x, y, z), id));
-                    break;
-                }
-                case Rotation: {
-                    float x = buf.readFloat();
-                    float y = buf.readFloat();
-                    float z = buf.readFloat();
-                    entries.add(new Entry(index, new EulerAngle(x, y, z), id));
-                    break;
-                }
-                default:
-                    System.out.println("[Out] Unhandled MetaDataType: " + type);
-                    break;
-            }
-        }
-        return entries;
-    }
-
-    @Getter
-    @Setter
-    public static final class Entry {
-
-        private final int oldID;
-        private MetaIndex index;
-        private Object value;
-
-        private Entry(MetaIndex index, Object value, int id) {
-            this.index = index;
-            this.value = value;
-            this.oldID = id;
-        }
-    }
-}

src/main/java/us/myles/ViaVersion/packets/PacketType.java

@@ -1,200 +1,208 @@
-package us.myles.ViaVersion.packets;
-
-public enum PacketType {
-    /* Handshake serverbound */
-    HANDSHAKE(State.HANDSHAKE, Direction.INCOMING, 0x00),
-    /* Login serverbound */
-    LOGIN_START(State.LOGIN, Direction.INCOMING, 0x00),
-    LOGIN_ENCRYPTION_RESPONSE(State.LOGIN, Direction.INCOMING, 0x01),
-    /* Login clientbound */
-    LOGIN_DISCONNECT(State.LOGIN, Direction.OUTGOING, 0x00),
-    LOGIN_ENCRYPTION_REQUEST(State.LOGIN, Direction.OUTGOING, 0x01),
-    LOGIN_SUCCESS(State.LOGIN, Direction.OUTGOING, 0x02),
-    LOGIN_SETCOMPRESSION(State.LOGIN, Direction.OUTGOING, 0x03),
-    /* Status serverbound */
-    STATUS_REQUEST(State.STATUS, Direction.INCOMING, 0x00),
-    STATUS_PING(State.STATUS, Direction.INCOMING, 0x01),
-    /* Status clientbound */
-    STATUS_RESPONSE(State.STATUS, Direction.OUTGOING, 0x00),
-    STATUS_PONG(State.STATUS, Direction.OUTGOING, 0x01),
-    /* Play serverbound */
-    PLAY_TP_CONFIRM(State.PLAY, Direction.INCOMING, -1, 0x00),
-    PLAY_TAB_COMPLETE_REQUEST(State.PLAY, Direction.INCOMING, 0x14, 0x01),
-    PLAY_CHAT_MESSAGE_CLIENT(State.PLAY, Direction.INCOMING, 0x01, 0x02),
-    PLAY_CLIENT_STATUS(State.PLAY, Direction.INCOMING, 0x16, 0x03),
-    PLAY_CLIENT_SETTINGS(State.PLAY, Direction.INCOMING, 0x15, 0x04),
-    PLAY_CONFIRM_TRANS(State.PLAY, Direction.INCOMING, 0x0F, 0x05),
-    PLAY_ENCHANT_ITEM(State.PLAY, Direction.INCOMING, 0x11, 0x06),
-    PLAY_CLICK_WINDOW(State.PLAY, Direction.INCOMING, 0x0E, 0x07),
-    PLAY_CLOSE_WINDOW_REQUEST(State.PLAY, Direction.INCOMING, 0x0D, 0x08),
-    PLAY_PLUGIN_MESSAGE_REQUEST(State.PLAY, Direction.INCOMING, 0x17, 0x09),
-    PLAY_USE_ENTITY(State.PLAY, Direction.INCOMING, 0x02, 0x0A),
-    PLAY_KEEP_ALIVE_REQUEST(State.PLAY, Direction.INCOMING, 0x00, 0x0B),
-    PLAY_PLAYER_POSITION_REQUEST(State.PLAY, Direction.INCOMING, 0x04, 0x0C),
-    PLAY_PLAYER_POSITION_LOOK_REQUEST(State.PLAY, Direction.INCOMING, 0x06, 0x0D),
-    PLAY_PLAYER_LOOK_REQUEST(State.PLAY, Direction.INCOMING, 0x05, 0x0E),
-    PLAY_PLAYER(State.PLAY, Direction.INCOMING, 0x03, 0x0F),
-    PLAY_VEHICLE_MOVE_REQUEST(State.PLAY, Direction.INCOMING, -1, 0x10),
-    PLAY_STEER_BOAT(State.PLAY, Direction.INCOMING, -1, 0x11),
-    PLAY_PLAYER_ABILITIES_REQUEST(State.PLAY, Direction.INCOMING, 0x13, 0x12),
-    PLAY_PLAYER_DIGGING(State.PLAY, Direction.INCOMING, 0x07, 0x13),
-    PLAY_ENTITY_ACTION(State.PLAY, Direction.INCOMING, 0x0B, 0x14),
-    PLAY_STEER_VEHICLE(State.PLAY, Direction.INCOMING, 0x0C, 0x15),
-    PLAY_RESOURCE_PACK_STATUS(State.PLAY, Direction.INCOMING, 0x19, 0x16),
-    PLAY_HELD_ITEM_CHANGE_REQUEST(State.PLAY, Direction.INCOMING, 0x09, 0x17),
-    PLAY_CREATIVE_INVENTORY_ACTION(State.PLAY, Direction.INCOMING, 0x10, 0x18),
-    PLAY_UPDATE_SIGN_REQUEST(State.PLAY, Direction.INCOMING, 0x12, 0x19),
-    PLAY_ANIMATION_REQUEST(State.PLAY, Direction.INCOMING, 0x0A, 0x1A),
-    PLAY_SPECTATE(State.PLAY, Direction.INCOMING, 0x18, 0x1B),
-    PLAY_PLAYER_BLOCK_PLACEMENT(State.PLAY, Direction.INCOMING, 0x08, 0x1C),
-    PLAY_USE_ITEM(State.PLAY, Direction.INCOMING, -1, 0x1D),
-    /* Play clientbound */
-    PLAY_SPAWN_OBJECT(State.PLAY, Direction.OUTGOING, 0x0E, 0x00),
-    PLAY_SPAWN_XP_ORB(State.PLAY, Direction.OUTGOING, 0x11, 0x01),
-    PLAY_SPAWN_GLOBAL_ENTITY(State.PLAY, Direction.OUTGOING, 0x2C, 0x02),
-    PLAY_SPAWN_MOB(State.PLAY, Direction.OUTGOING, 0x0F, 0x03),
-    PLAY_SPAWN_PAINTING(State.PLAY, Direction.OUTGOING, 0x10, 0x04),
-    PLAY_SPAWN_PLAYER(State.PLAY, Direction.OUTGOING, 0x0C, 0x05),
-    PLAY_ANIMATION(State.PLAY, Direction.OUTGOING, 0x0B, 0x06),
-    PLAY_STATS(State.PLAY, Direction.OUTGOING, 0x37, 0x07),
-    PLAY_BLOCK_BREAK_ANIMATION(State.PLAY, Direction.OUTGOING, 0x25, 0x08),
-    PLAY_UPDATE_BLOCK_ENTITY(State.PLAY, Direction.OUTGOING, 0x35, 0x09),
-    PLAY_BLOCK_ACTION(State.PLAY, Direction.OUTGOING, 0x24, 0x0A),
-    PLAY_BLOCK_CHANGE(State.PLAY, Direction.OUTGOING, 0x23, 0x0B),
-    PLAY_BOSS_BAR(State.PLAY, Direction.OUTGOING, -1, 0x0C),
-    PLAY_SERVER_DIFFICULTY(State.PLAY, Direction.OUTGOING, 0x41, 0x0D),
-    PLAY_TAB_COMPLETE(State.PLAY, Direction.OUTGOING, 0x3A, 0x0E),
-    PLAY_CHAT_MESSAGE(State.PLAY, Direction.OUTGOING, 0x02, 0x0F),
-    PLAY_MULTI_BLOCK_CHANGE(State.PLAY, Direction.OUTGOING, 0x22, 0x10),
-    PLAY_CONFIRM_TRANSACTION(State.PLAY, Direction.OUTGOING, 0x32, 0x11),
-    PLAY_CLOSE_WINDOW(State.PLAY, Direction.OUTGOING, 0x2E, 0x12),
-    PLAY_OPEN_WINDOW(State.PLAY, Direction.OUTGOING, 0x2D, 0x13),
-    PLAY_WINDOW_ITEMS(State.PLAY, Direction.OUTGOING, 0x30, 0x14),
-    PLAY_WINDOW_PROPERTY(State.PLAY, Direction.OUTGOING, 0x31, 0x15),
-    PLAY_SET_SLOT(State.PLAY, Direction.OUTGOING, 0x2F, 0x16),
-    PLAY_SET_COOLDOWN(State.PLAY, Direction.OUTGOING, -1, 0x17),
-    PLAY_PLUGIN_MESSAGE(State.PLAY, Direction.OUTGOING, 0x3F, 0x18),
-    PLAY_NAMED_SOUND_EFFECT(State.PLAY, Direction.OUTGOING, 0x29, 0x19),
-    PLAY_DISCONNECT(State.PLAY, Direction.OUTGOING, 0x40, 0x1A),
-    PLAY_ENTITY_STATUS(State.PLAY, Direction.OUTGOING, 0x1A, 0x1B),
-    PLAY_EXPLOSION(State.PLAY, Direction.OUTGOING, 0x27, 0x1C),
-    PLAY_UNLOAD_CHUNK(State.PLAY, Direction.OUTGOING, -1, 0x1D),
-    PLAY_CHANGE_GAME_STATE(State.PLAY, Direction.OUTGOING, 0x2B, 0x1E),
-    PLAY_KEEP_ALIVE(State.PLAY, Direction.OUTGOING, 0x00, 0x1F),
-    PLAY_CHUNK_DATA(State.PLAY, Direction.OUTGOING, 0x21, 0x20),
-    PLAY_EFFECT(State.PLAY, Direction.OUTGOING, 0x28, 0x21),
-    PLAY_PARTICLE(State.PLAY, Direction.OUTGOING, 0x2A, 0x22),
-    PLAY_JOIN_GAME(State.PLAY, Direction.OUTGOING, 0x01, 0x23),
-    PLAY_MAP(State.PLAY, Direction.OUTGOING, 0x34, 0x24),
-    PLAY_ENTITY_RELATIVE_MOVE(State.PLAY, Direction.OUTGOING, 0x15, 0x25),
-    PLAY_ENTITY_LOOK_MOVE(State.PLAY, Direction.OUTGOING, 0x17, 0x26),
-    PLAY_ENTITY_LOOK(State.PLAY, Direction.OUTGOING, 0x16, 0x27),
-    PLAY_ENTITY(State.PLAY, Direction.OUTGOING, 0x14, 0x28),
-    PLAY_VEHICLE_MOVE(State.PLAY, Direction.OUTGOING, -1, 0x29),
-    PLAY_OPEN_SIGN_EDITOR(State.PLAY, Direction.OUTGOING, 0x36, 0x2A),
-    PLAY_PLAYER_ABILITIES(State.PLAY, Direction.OUTGOING, 0x39, 0x2B),
-    PLAY_COMBAT_EVENT(State.PLAY, Direction.OUTGOING, 0x42, 0x2C),
-    PLAY_PLAYER_LIST_ITEM(State.PLAY, Direction.OUTGOING, 0x38, 0x2D),
-    PLAY_PLAYER_POSITION_LOOK(State.PLAY, Direction.OUTGOING, 0x08, 0x2E),
-    PLAY_USE_BED(State.PLAY, Direction.OUTGOING, 0x0A, 0x2F),
-    PLAY_DESTROY_ENTITIES(State.PLAY, Direction.OUTGOING, 0x13, 0x30),
-    PLAY_REMOVE_ENTITY_EFFECT(State.PLAY, Direction.OUTGOING, 0x1E, 0x31),
-    PLAY_RESOURCE_PACK_SEND(State.PLAY, Direction.OUTGOING, 0x48, 0x32),
-    PLAY_RESPAWN(State.PLAY, Direction.OUTGOING, 0x07, 0x33),
-    PLAY_ENTITY_HEAD_LOOK(State.PLAY, Direction.OUTGOING, 0x19, 0x34),
-    PLAY_WORLD_BORDER(State.PLAY, Direction.OUTGOING, 0x44, 0x35),
-    PLAY_CAMERA(State.PLAY, Direction.OUTGOING, 0x43, 0x36),
-    PLAY_HELD_ITEM_CHANGE(State.PLAY, Direction.OUTGOING, 0x09, 0x37),
-    PLAY_DISPLAY_SCOREBOARD(State.PLAY, Direction.OUTGOING, 0x3D, 0x38),
-    PLAY_ENTITY_METADATA(State.PLAY, Direction.OUTGOING, 0x1C, 0x39),
-    PLAY_ATTACH_ENTITY(State.PLAY, Direction.OUTGOING, 0x1B, 0x3A),
-    PLAY_ENTITY_VELOCITY(State.PLAY, Direction.OUTGOING, 0x12, 0x3B),
-    PLAY_ENTITY_EQUIPMENT(State.PLAY, Direction.OUTGOING, 0x04, 0x3C),
-    PLAY_SET_XP(State.PLAY, Direction.OUTGOING, 0x1F, 0x3D),
-    PLAY_UPDATE_HEALTH(State.PLAY, Direction.OUTGOING, 0x06, 0x3E),
-    PLAY_SCOREBOARD_OBJ(State.PLAY, Direction.OUTGOING, 0x3B, 0x3F),
-    PLAY_SET_PASSENGERS(State.PLAY, Direction.OUTGOING, -1, 0x40),
-    PLAY_TEAM(State.PLAY, Direction.OUTGOING, 0x3E, 0x41),
-    PLAY_UPDATE_SCORE(State.PLAY, Direction.OUTGOING, 0x3C, 0x42),
-    PLAY_SPAWN_POSITION(State.PLAY, Direction.OUTGOING, 0x05, 0x43),
-    PLAY_TIME_UPDATE(State.PLAY, Direction.OUTGOING, 0x03, 0x44),
-    PLAY_TITLE(State.PLAY, Direction.OUTGOING, 0x45, 0x45),
-    PLAY_UPDATE_SIGN(State.PLAY, Direction.OUTGOING, 0x33, 0x46),
-    PLAY_SOUND_EFFECT(State.PLAY, Direction.OUTGOING, -1, 0x47),
-    PLAY_PLAYER_LIST_HEADER_FOOTER(State.PLAY, Direction.OUTGOING, 0x47, 0x48),
-    PLAY_COLLECT_ITEM(State.PLAY, Direction.OUTGOING, 0x0D, 0x49),
-    PLAY_ENTITY_TELEPORT(State.PLAY, Direction.OUTGOING, 0x18, 0x4A),
-    PLAY_ENTITY_PROPERTIES(State.PLAY, Direction.OUTGOING, 0x20, 0x4B),
-    PLAY_ENTITY_EFFECT(State.PLAY, Direction.OUTGOING, 0x1D, 0x4C),
-
-    PLAY_MAP_CHUNK_BULK(State.PLAY, Direction.OUTGOING, 0x26, -1),
-    PLAY_SET_COMPRESSION(State.PLAY, Direction.OUTGOING, 0x46, -1),
-    PLAY_UPDATE_ENTITY_NBT(State.PLAY, Direction.OUTGOING, 0x49, -1),;
-
-    private State state;
-    private Direction direction;
-    private int packetID;
-    private int newPacketID = -1;
-
-    PacketType(State state, Direction direction, int packetID) {
-        this.state = state;
-        this.direction = direction;
-        this.packetID = packetID;
-        this.newPacketID = packetID;
-    }
-
-    PacketType(State state, Direction direction, int packetID, int newPacketID) {
-        this.state = state;
-        this.direction = direction;
-        this.packetID = packetID;
-        this.newPacketID = newPacketID;
-    }
-
-    public State getState() {
-        return state;
-    }
-
-    public Direction getDirection() {
-        return direction;
-    }
-
-    public int getPacketID() {
-        return packetID;
-    }
-
-    public int getNewPacketID() {
-        return newPacketID;
-    }
-
-    public static PacketType findNewPacket(State state, Direction direction, int id) {
-    	if(id == -1)
-    		return null;
-        for (PacketType pt : values()) {
-            if (pt.getNewPacketID() == id
-                    && pt.getState() == state
-                    && pt.getDirection() == direction)
-                return pt;
-        }
-        return null;
-    }
-
-    public static PacketType findOldPacket(State state, Direction direction, int id) {
-    	if(id == -1)
-    		return null;
-        for (PacketType pt : values()) {
-            if (pt.getPacketID() == id
-                    && pt.getState() == state
-                    && pt.getDirection() == direction)
-                return pt;
-        }
-        return null;
-    }
-
-    public static PacketType getIncomingPacket(State state, int id) {
-        return findNewPacket(state, Direction.INCOMING, id);
-    }
-
-    public static PacketType getOutgoingPacket(State state, int id) {
-        return findOldPacket(state, Direction.OUTGOING, id);
-    }
-}
+package us.myles.ViaVersion.packets;
+
+import java.util.HashMap;
+
+@Deprecated
+public enum PacketType {
+    /* Handshake serverbound */
+    HANDSHAKE(State.HANDSHAKE, Direction.INCOMING, 0x00), // Mapped
+    /* Login serverbound */
+    LOGIN_START(State.LOGIN, Direction.INCOMING, 0x00), // Mapped
+    LOGIN_ENCRYPTION_RESPONSE(State.LOGIN, Direction.INCOMING, 0x01), // Mapped
+    /* Login clientbound */
+    LOGIN_DISCONNECT(State.LOGIN, Direction.OUTGOING, 0x00), // Mapped
+    LOGIN_ENCRYPTION_REQUEST(State.LOGIN, Direction.OUTGOING, 0x01), // Mapped
+    LOGIN_SUCCESS(State.LOGIN, Direction.OUTGOING, 0x02), // Mapped
+    LOGIN_SETCOMPRESSION(State.LOGIN, Direction.OUTGOING, 0x03), // Mapped
+
+    /* Status serverbound */
+    STATUS_REQUEST(State.STATUS, Direction.INCOMING, 0x00), // Mapped
+    STATUS_PING(State.STATUS, Direction.INCOMING, 0x01), // Mapped
+    /* Status clientbound */
+    STATUS_RESPONSE(State.STATUS, Direction.OUTGOING, 0x00),
+    STATUS_PONG(State.STATUS, Direction.OUTGOING, 0x01),
+    /* Play serverbound */
+    PLAY_TP_CONFIRM(State.PLAY, Direction.INCOMING, -1, 0x00), // Mapped
+    PLAY_TAB_COMPLETE_REQUEST(State.PLAY, Direction.INCOMING, 0x14, 0x01), // Mapped
+    PLAY_CHAT_MESSAGE_CLIENT(State.PLAY, Direction.INCOMING, 0x01, 0x02), // Mapped
+    PLAY_CLIENT_STATUS(State.PLAY, Direction.INCOMING, 0x16, 0x03), // Mapped
+    PLAY_CLIENT_SETTINGS(State.PLAY, Direction.INCOMING, 0x15, 0x04), // Mapped
+    PLAY_CONFIRM_TRANS(State.PLAY, Direction.INCOMING, 0x0F, 0x05), // Mapped
+    PLAY_ENCHANT_ITEM(State.PLAY, Direction.INCOMING, 0x11, 0x06), // Mapped
+    PLAY_CLICK_WINDOW(State.PLAY, Direction.INCOMING, 0x0E, 0x07), // Mapped
+    PLAY_CLOSE_WINDOW_REQUEST(State.PLAY, Direction.INCOMING, 0x0D, 0x08), // Mapped
+    PLAY_PLUGIN_MESSAGE_REQUEST(State.PLAY, Direction.INCOMING, 0x17, 0x09),
+    PLAY_USE_ENTITY(State.PLAY, Direction.INCOMING, 0x02, 0x0A), // Mapped
+    PLAY_KEEP_ALIVE_REQUEST(State.PLAY, Direction.INCOMING, 0x00, 0x0B), // Mapped
+    PLAY_PLAYER_POSITION_REQUEST(State.PLAY, Direction.INCOMING, 0x04, 0x0C), // Mapped
+    PLAY_PLAYER_POSITION_LOOK_REQUEST(State.PLAY, Direction.INCOMING, 0x06, 0x0D), // Mapped
+    PLAY_PLAYER_LOOK_REQUEST(State.PLAY, Direction.INCOMING, 0x05, 0x0E), // Mapped
+    PLAY_PLAYER(State.PLAY, Direction.INCOMING, 0x03, 0x0F), // Mapped
+    PLAY_VEHICLE_MOVE_REQUEST(State.PLAY, Direction.INCOMING, -1, 0x10), // Mapped
+    PLAY_STEER_BOAT(State.PLAY, Direction.INCOMING, -1, 0x11), // Mapped
+    PLAY_PLAYER_ABILITIES_REQUEST(State.PLAY, Direction.INCOMING, 0x13, 0x12), // Mapped
+    PLAY_PLAYER_DIGGING(State.PLAY, Direction.INCOMING, 0x07, 0x13), // Mapped
+    PLAY_ENTITY_ACTION(State.PLAY, Direction.INCOMING, 0x0B, 0x14), // Mapped
+    PLAY_STEER_VEHICLE(State.PLAY, Direction.INCOMING, 0x0C, 0x15), // Mapped
+
+    PLAY_RESOURCE_PACK_STATUS(State.PLAY, Direction.INCOMING, 0x19, 0x16), // Mapped
+    PLAY_HELD_ITEM_CHANGE_REQUEST(State.PLAY, Direction.INCOMING, 0x09, 0x17), // Mapped
+
+    PLAY_CREATIVE_INVENTORY_ACTION(State.PLAY, Direction.INCOMING, 0x10, 0x18), // Mapped
+    PLAY_UPDATE_SIGN_REQUEST(State.PLAY, Direction.INCOMING, 0x12, 0x19), // Mapped
+    PLAY_ANIMATION_REQUEST(State.PLAY, Direction.INCOMING, 0x0A, 0x1A), // Mapped
+    PLAY_SPECTATE(State.PLAY, Direction.INCOMING, 0x18, 0x1B), // Mapped
+    PLAY_PLAYER_BLOCK_PLACEMENT(State.PLAY, Direction.INCOMING, 0x08, 0x1C), // Mapped
+    PLAY_USE_ITEM(State.PLAY, Direction.INCOMING, -1, 0x1D), // Mapped
+    /* Play clientbound */
+    PLAY_SPAWN_OBJECT(State.PLAY, Direction.OUTGOING, 0x0E, 0x00), // Mapped
+    PLAY_SPAWN_XP_ORB(State.PLAY, Direction.OUTGOING, 0x11, 0x01), // Mapped
+    PLAY_SPAWN_GLOBAL_ENTITY(State.PLAY, Direction.OUTGOING, 0x2C, 0x02), // Mapped
+    PLAY_SPAWN_MOB(State.PLAY, Direction.OUTGOING, 0x0F, 0x03), // Mapped
+    PLAY_SPAWN_PAINTING(State.PLAY, Direction.OUTGOING, 0x10, 0x04), // Mapped
+    PLAY_SPAWN_PLAYER(State.PLAY, Direction.OUTGOING, 0x0C, 0x05), // Mapped
+
+    PLAY_ANIMATION(State.PLAY, Direction.OUTGOING, 0x0B, 0x06), // Mapped
+    PLAY_STATS(State.PLAY, Direction.OUTGOING, 0x37, 0x07), // Mapped
+
+    PLAY_BLOCK_BREAK_ANIMATION(State.PLAY, Direction.OUTGOING, 0x25, 0x08), // Mapped
+    PLAY_UPDATE_BLOCK_ENTITY(State.PLAY, Direction.OUTGOING, 0x35, 0x09), // Mapped
+    PLAY_BLOCK_ACTION(State.PLAY, Direction.OUTGOING, 0x24, 0x0A), // Mapped
+    PLAY_BLOCK_CHANGE(State.PLAY, Direction.OUTGOING, 0x23, 0x0B), // Mapped
+
+    PLAY_BOSS_BAR(State.PLAY, Direction.OUTGOING, -1, 0x0C),
+    PLAY_SERVER_DIFFICULTY(State.PLAY, Direction.OUTGOING, 0x41, 0x0D), // Mapped
+    PLAY_TAB_COMPLETE(State.PLAY, Direction.OUTGOING, 0x3A, 0x0E), // Mapped
+    PLAY_CHAT_MESSAGE(State.PLAY, Direction.OUTGOING, 0x02, 0x0F), // Mapped
+    PLAY_MULTI_BLOCK_CHANGE(State.PLAY, Direction.OUTGOING, 0x22, 0x10), // Mapped
+    PLAY_CONFIRM_TRANSACTION(State.PLAY, Direction.OUTGOING, 0x32, 0x11), // Mapped
+    PLAY_CLOSE_WINDOW(State.PLAY, Direction.OUTGOING, 0x2E, 0x12), // Mapped
+    PLAY_OPEN_WINDOW(State.PLAY, Direction.OUTGOING, 0x2D, 0x13), // Mapped
+    PLAY_WINDOW_ITEMS(State.PLAY, Direction.OUTGOING, 0x30, 0x14), // Mapped
+    PLAY_WINDOW_PROPERTY(State.PLAY, Direction.OUTGOING, 0x31, 0x15), // Mapped
+    PLAY_SET_SLOT(State.PLAY, Direction.OUTGOING, 0x2F, 0x16), // Mapped
+    PLAY_SET_COOLDOWN(State.PLAY, Direction.OUTGOING, -1, 0x17),
+    PLAY_PLUGIN_MESSAGE(State.PLAY, Direction.OUTGOING, 0x3F, 0x18), // Mapped
+    PLAY_NAMED_SOUND_EFFECT(State.PLAY, Direction.OUTGOING, 0x29, 0x19), // Mapped
+    PLAY_DISCONNECT(State.PLAY, Direction.OUTGOING, 0x40, 0x1A), // Mapped
+    PLAY_ENTITY_STATUS(State.PLAY, Direction.OUTGOING, 0x1A, 0x1B), // Mapped
+    PLAY_EXPLOSION(State.PLAY, Direction.OUTGOING, 0x27, 0x1C), // Mapped
+    PLAY_UNLOAD_CHUNK(State.PLAY, Direction.OUTGOING, -1, 0x1D),
+    PLAY_CHANGE_GAME_STATE(State.PLAY, Direction.OUTGOING, 0x2B, 0x1E),
+    PLAY_KEEP_ALIVE(State.PLAY, Direction.OUTGOING, 0x00, 0x1F), // Mapped
+    PLAY_CHUNK_DATA(State.PLAY, Direction.OUTGOING, 0x21, 0x20), // Mapped
+    PLAY_EFFECT(State.PLAY, Direction.OUTGOING, 0x28, 0x21), // Mapped
+    PLAY_PARTICLE(State.PLAY, Direction.OUTGOING, 0x2A, 0x22), // Mapped
+    PLAY_JOIN_GAME(State.PLAY, Direction.OUTGOING, 0x01, 0x23), // Mapped
+    PLAY_MAP(State.PLAY, Direction.OUTGOING, 0x34, 0x24), // Mapped
+    PLAY_ENTITY_RELATIVE_MOVE(State.PLAY, Direction.OUTGOING, 0x15, 0x25), // Mapped
+    PLAY_ENTITY_LOOK_MOVE(State.PLAY, Direction.OUTGOING, 0x17, 0x26), // Mapped
+    PLAY_ENTITY_LOOK(State.PLAY, Direction.OUTGOING, 0x16, 0x27), // Mapped
+    PLAY_ENTITY(State.PLAY, Direction.OUTGOING, 0x14, 0x28), // Mapped
+    PLAY_VEHICLE_MOVE(State.PLAY, Direction.OUTGOING, -1, 0x29),
+    PLAY_OPEN_SIGN_EDITOR(State.PLAY, Direction.OUTGOING, 0x36, 0x2A), // Mapped
+    PLAY_PLAYER_ABILITIES(State.PLAY, Direction.OUTGOING, 0x39, 0x2B), // Mapped
+    PLAY_COMBAT_EVENT(State.PLAY, Direction.OUTGOING, 0x42, 0x2C), // Mapped
+    PLAY_PLAYER_LIST_ITEM(State.PLAY, Direction.OUTGOING, 0x38, 0x2D), // Mapped
+    PLAY_PLAYER_POSITION_LOOK(State.PLAY, Direction.OUTGOING, 0x08, 0x2E), // Mapped
+    PLAY_USE_BED(State.PLAY, Direction.OUTGOING, 0x0A, 0x2F), // Mapped
+    PLAY_DESTROY_ENTITIES(State.PLAY, Direction.OUTGOING, 0x13, 0x30), // Mapped
+    PLAY_REMOVE_ENTITY_EFFECT(State.PLAY, Direction.OUTGOING, 0x1E, 0x31), // Mapped
+    PLAY_RESOURCE_PACK_SEND(State.PLAY, Direction.OUTGOING, 0x48, 0x32), // Mapped
+    PLAY_RESPAWN(State.PLAY, Direction.OUTGOING, 0x07, 0x33), // Mapped
+    PLAY_ENTITY_HEAD_LOOK(State.PLAY, Direction.OUTGOING, 0x19, 0x34), // Mapped
+    PLAY_WORLD_BORDER(State.PLAY, Direction.OUTGOING, 0x44, 0x35), // Mapped
+    PLAY_CAMERA(State.PLAY, Direction.OUTGOING, 0x43, 0x36), // Mapped
+    PLAY_HELD_ITEM_CHANGE(State.PLAY, Direction.OUTGOING, 0x09, 0x37), // Mapped
+    PLAY_DISPLAY_SCOREBOARD(State.PLAY, Direction.OUTGOING, 0x3D, 0x38), // Mapped
+    PLAY_ENTITY_METADATA(State.PLAY, Direction.OUTGOING, 0x1C, 0x39), // Mapped
+    PLAY_ATTACH_ENTITY(State.PLAY, Direction.OUTGOING, 0x1B, 0x3A), // Mapped
+    PLAY_ENTITY_VELOCITY(State.PLAY, Direction.OUTGOING, 0x12, 0x3B), // Mapped
+    PLAY_ENTITY_EQUIPMENT(State.PLAY, Direction.OUTGOING, 0x04, 0x3C), // Mapped
+    PLAY_SET_XP(State.PLAY, Direction.OUTGOING, 0x1F, 0x3D), // Mapped
+    PLAY_UPDATE_HEALTH(State.PLAY, Direction.OUTGOING, 0x06, 0x3E), // Mapped
+    PLAY_SCOREBOARD_OBJ(State.PLAY, Direction.OUTGOING, 0x3B, 0x3F), // Mapped
+    PLAY_SET_PASSENGERS(State.PLAY, Direction.OUTGOING, -1, 0x40),
+    PLAY_TEAM(State.PLAY, Direction.OUTGOING, 0x3E, 0x41), // Mapped
+    PLAY_UPDATE_SCORE(State.PLAY, Direction.OUTGOING, 0x3C, 0x42), // Mapped
+    PLAY_SPAWN_POSITION(State.PLAY, Direction.OUTGOING, 0x05, 0x43), // Mapped
+    PLAY_TIME_UPDATE(State.PLAY, Direction.OUTGOING, 0x03, 0x44), // Mapped
+    PLAY_TITLE(State.PLAY, Direction.OUTGOING, 0x45, 0x45), // Mapped
+    PLAY_UPDATE_SIGN(State.PLAY, Direction.OUTGOING, 0x33, 0x46), // Mapped
+    PLAY_SOUND_EFFECT(State.PLAY, Direction.OUTGOING, -1, 0x47),
+    PLAY_PLAYER_LIST_HEADER_FOOTER(State.PLAY, Direction.OUTGOING, 0x47, 0x48), // Mapped
+    PLAY_COLLECT_ITEM(State.PLAY, Direction.OUTGOING, 0x0D, 0x49), // Mapped
+    PLAY_ENTITY_TELEPORT(State.PLAY, Direction.OUTGOING, 0x18, 0x4A), // Mapped
+    PLAY_ENTITY_PROPERTIES(State.PLAY, Direction.OUTGOING, 0x20, 0x4B), // Mapped
+    PLAY_ENTITY_EFFECT(State.PLAY, Direction.OUTGOING, 0x1D, 0x4C), // Mapped
+
+    PLAY_MAP_CHUNK_BULK(State.PLAY, Direction.OUTGOING, 0x26, -1),
+    PLAY_SET_COMPRESSION(State.PLAY, Direction.OUTGOING, 0x46, -1),
+    PLAY_UPDATE_ENTITY_NBT(State.PLAY, Direction.OUTGOING, 0x49, -1);
+
+    private static HashMap<Short, PacketType> oldids = new HashMap<>();
+    private static HashMap<Short, PacketType> newids = new HashMap<>();
+
+    static {
+        for (PacketType pt : PacketType.values()) {
+            oldids.put(toShort((short) pt.getPacketID(), (short) pt.getDirection().ordinal(), (short) pt.getState().ordinal()), pt);
+            newids.put(toShort((short) pt.getNewPacketID(), (short) pt.getDirection().ordinal(), (short) pt.getState().ordinal()), pt);
+        }
+    }
+
+    private State state;
+    private Direction direction;
+    private int packetID;
+    private int newPacketID = -1;
+
+    PacketType(State state, Direction direction, int packetID) {
+        this.state = state;
+        this.direction = direction;
+        this.packetID = packetID;
+        this.newPacketID = packetID;
+    }
+
+    PacketType(State state, Direction direction, int packetID, int newPacketID) {
+        this.state = state;
+        this.direction = direction;
+        this.packetID = packetID;
+        this.newPacketID = newPacketID;
+    }
+
+    public static PacketType findNewPacket(State state, Direction direction, int id) {
+        return newids.get(toShort((short) id, (short) direction.ordinal(), (short) state.ordinal()));
+    }
+
+    public static PacketType findOldPacket(State state, Direction direction, int id) {
+        return oldids.get(toShort((short) id, (short) direction.ordinal(), (short) state.ordinal()));
+    }
+
+    public static PacketType getIncomingPacket(State state, int id) {
+        return findNewPacket(state, Direction.INCOMING, id);
+    }
+
+    public static PacketType getOutgoingPacket(State state, int id) {
+        return findOldPacket(state, Direction.OUTGOING, id);
+    }
+
+    private static short toShort(short id, short direction, short state) {
+        return (short) ((id & 0x00FF) | (direction << 8) & 0x0F00 | (state << 12) & 0xF000);
+    }
+
+    public State getState() {
+        return state;
+    }
+
+    public Direction getDirection() {
+        return direction;
+    }
+
+    public int getPacketID() {
+        return packetID;
+    }
+
+    public int getNewPacketID() {
+        return newPacketID;
+    }
+
+}

src/main/java/us/myles/ViaVersion/protocols/base/BaseProtocol.java

@@ -0,0 +1,160 @@
+package us.myles.ViaVersion.protocols.base;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Pair;
+import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
+import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
+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 java.util.List;
+import java.util.UUID;
+
+public class BaseProtocol extends Protocol {
+
+    @Override
+    protected void registerPackets() {
+        /* Outgoing Packets */
+        registerOutgoing(State.STATUS, 0x00, 0x00, new PacketRemapper() { // Status Response Packet
+            @Override
+            public void registerMap() {
+                map(Type.STRING);
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ProtocolInfo info = wrapper.user().get(ProtocolInfo.class);
+                        String originalStatus = wrapper.get(Type.STRING, 0);
+                        try {
+                            JSONObject json = (JSONObject) new JSONParser().parse(originalStatus);
+                            JSONObject version = (JSONObject) json.get("version");
+
+                            if (ProtocolRegistry.SERVER_PROTOCOL == -1) {
+                                Long original = (Long) version.get("protocol");
+                                ProtocolRegistry.SERVER_PROTOCOL = original.intValue();
+                            }
+                            List<Pair<Integer, Protocol>> protocols = ProtocolRegistry.getProtocolPath(info.getProtocolVersion(), ProtocolRegistry.SERVER_PROTOCOL);
+                            if (protocols != null) {
+                                version.put("protocol", info.getProtocolVersion());
+                            } else {
+                                // not compatible :(, *plays very sad violin*
+                                wrapper.user().setActive(false);
+                            }
+                            wrapper.set(Type.STRING, 0, json.toJSONString()); // Update value
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+            }
+        });
+
+        registerOutgoing(State.STATUS, 0x01, 0x01); // Status Pong Packet
+
+        registerOutgoing(State.LOGIN, 0x00, 0x00); // Login Disconnect Packet
+        registerOutgoing(State.LOGIN, 0x01, 0x01); // Encryption Request Packet
+
+        // Login Success Packet
+        registerOutgoing(State.LOGIN, 0x02, 0x02, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - UUID as String
+                map(Type.STRING); // 1 - Player Username
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ProtocolInfo info = wrapper.user().get(ProtocolInfo.class);
+                        info.setState(State.PLAY);
+                        // Save other info
+                        UUID uuid = UUID.fromString(wrapper.get(Type.STRING, 0));
+                        info.setUuid(uuid);
+                        info.setUsername(wrapper.get(Type.STRING, 1));
+                        // Add to ported clients
+                        ((ViaVersionPlugin) ViaVersion.getInstance()).addPortedClient(wrapper.user());
+                    }
+                });
+            }
+        });
+
+        registerOutgoing(State.LOGIN, 0x03, 0x03); // Login Set Compression Packet
+        /* Incoming Packets */
+
+        // Handshake Packet
+        registerIncoming(State.HANDSHAKE, 0x00, 0x00, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                // select right protocol
+                map(Type.VAR_INT); // 0 - Client Protocol Version
+                map(Type.STRING); // 1 - Server Address
+                map(Type.UNSIGNED_SHORT); // 2 - Server Port
+                map(Type.VAR_INT); // 3 - Next State
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int protVer = wrapper.get(Type.VAR_INT, 0);
+                        int state = wrapper.get(Type.VAR_INT, 1);
+
+                        ProtocolInfo info = wrapper.user().get(ProtocolInfo.class);
+                        info.setProtocolVersion(protVer);
+                        // Choose the pipe
+                        List<Pair<Integer, Protocol>> protocols = ProtocolRegistry.getProtocolPath(info.getProtocolVersion(), ProtocolRegistry.SERVER_PROTOCOL);
+                        ProtocolPipeline pipeline = wrapper.user().get(ProtocolInfo.class).getPipeline();
+                        if (protocols != null) {
+                            for (Pair<Integer, Protocol> prot : protocols) {
+                                pipeline.add(prot.getValue());
+                            }
+                            wrapper.set(Type.VAR_INT, 0, ProtocolRegistry.SERVER_PROTOCOL);
+                        } else {
+                            if (state == 2) {
+                                // not compatible :(, *plays very sad violin*
+                                wrapper.user().setActive(false);
+                            }
+                        }
+
+                        // Change state
+                        if (state == 1) {
+                            info.setState(State.STATUS);
+                        }
+                        if (state == 2) {
+                            info.setState(State.LOGIN);
+                        }
+                    }
+                });
+            }
+        });
+        registerIncoming(State.STATUS, 0x00, 0x00); // Status Request Packet
+        registerIncoming(State.STATUS, 0x01, 0x01); // Status Ping Packet
+
+        registerIncoming(State.LOGIN, 0x00, 0x00); // Login Start Packet
+        registerIncoming(State.LOGIN, 0x01, 0x01); // Encryption Response Packet
+    }
+
+    @Override
+    public void init(UserConnection userConnection) {
+        // Nothing gets added, ProtocolPipeline handles ProtocolInfo
+    }
+
+    @Override
+    protected void registerListeners() {
+        final ViaVersionPlugin plugin = (ViaVersionPlugin) Bukkit.getPluginManager().getPlugin("ViaVersion");
+
+        Bukkit.getPluginManager().registerEvents(new Listener() {
+            @EventHandler
+            public void onPlayerQuit(PlayerQuitEvent e) {
+                plugin.removePortedClient(e.getPlayer().getUniqueId());
+            }
+        }, plugin);
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/base/ProtocolInfo.java

@@ -0,0 +1,24 @@
+package us.myles.ViaVersion.protocols.base;
+
+import lombok.Getter;
+import lombok.Setter;
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
+import us.myles.ViaVersion.packets.State;
+
+import java.util.UUID;
+
+@Getter
+@Setter
+public class ProtocolInfo extends StoredObject {
+    private State state = State.HANDSHAKE;
+    private int protocolVersion = -1;
+    private String username;
+    private UUID uuid;
+    private ProtocolPipeline pipeline;
+
+    public ProtocolInfo(UserConnection user) {
+        super(user);
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1to1_9/Protocol1_9_1TO1_9.java

@@ -0,0 +1,33 @@
+package us.myles.ViaVersion.protocols.protocol1_9_1to1_9;
+
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+
+public class Protocol1_9_1TO1_9 extends Protocol {
+    @Override
+    protected void registerPackets() {
+        // Currently supports 1.9.1 PRE 2
+        // Join Game Packet
+        registerOutgoing(State.PLAY, 0x23, 0x23, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Player ID
+                map(Type.UNSIGNED_BYTE); // 1 - Player Gamemode
+                // 1.9.1 PRE 2 Changed this
+                map(Type.BYTE, Type.INT); // 2 - Player Dimension
+                map(Type.UNSIGNED_BYTE); // 3 - World Difficulty
+                map(Type.UNSIGNED_BYTE); // 4 - Max Players (Tab)
+                map(Type.STRING); // 5 - Level Type
+                map(Type.BOOLEAN); // 6 - Reduced Debug info
+            }
+        });
+    }
+
+    @Override
+    public void init(UserConnection userConnection) {
+
+    }
+}

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

@@ -1,81 +1,90 @@
-package us.myles.ViaVersion.armor;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
-@RequiredArgsConstructor
-@Getter
-public enum ArmorType {
-
-    LEATHER_HELMET(1, 298, Material.LEATHER_HELMET),
-    LEATHER_CHESTPLATE(3, 299, Material.LEATHER_CHESTPLATE),
-    LEATHER_LEGGINGS(2, 300, Material.LEATHER_LEGGINGS),
-    LEATHER_BOOTS(1, 301, Material.LEATHER_BOOTS),
-    CHAINMAIL_HELMET(2, 302, Material.CHAINMAIL_HELMET),
-    CHAINMAIL_CHESTPLATE(5, 303, Material.CHAINMAIL_CHESTPLATE),
-    CHAINMAIL_LEGGINGS(4, 304, Material.CHAINMAIL_LEGGINGS),
-    CHAINMAIL_BOOTS(1, 305, Material.CHAINMAIL_BOOTS),
-    IRON_HELMET(2, 306, Material.IRON_HELMET),
-    IRON_CHESTPLATE(6, 307, Material.IRON_CHESTPLATE),
-    IRON_LEGGINGS(5, 308, Material.IRON_LEGGINGS),
-    IRON_BOOTS(2, 309, Material.IRON_BOOTS),
-    DIAMOND_HELMET(3, 310, Material.DIAMOND_HELMET),
-    DIAMOND_CHESTPLATE(8, 311, Material.DIAMOND_CHESTPLATE),
-    DIAMOND_LEGGINGS(6, 312, Material.DIAMOND_LEGGINGS),
-    DIAMOND_BOOTS(3, 313, Material.DIAMOND_BOOTS),
-    GOLD_HELMET(2, 314, Material.GOLD_HELMET),
-    GOLD_CHESTPLATE(5, 315, Material.GOLD_CHESTPLATE),
-    GOLD_LEGGINGS(3, 316, Material.GOLD_LEGGINGS),
-    GOLD_BOOTS(1, 317, Material.GOLD_BOOTS),
-    NONE(0, 0, Material.AIR);
-
-    private final int armorPoints;
-    private final int id;
-    private final Material type;
-
-    public static ArmorType findByType(Material type) {
-        for(ArmorType a : ArmorType.values())
-            if(a.getType() == type)
-                return a;
-        return ArmorType.NONE;
-    }
-
-    public static int calculateArmorPoints(ItemStack[] armor) {
-        int total = 0;
-        for (ItemStack anArmor : armor) {
-            if (anArmor != null)
-                total += findByType(anArmor.getType()).getArmorPoints();
-        }
-        return total;
-    }
-
-    public static ArmorType findById(int id) {
-        for(ArmorType a : ArmorType.values())
-            if(a.getId() == id)
-                return a;
-        return ArmorType.NONE;
-    }
-
-    public static boolean isArmor(Material material){
-        for(ArmorType a : ArmorType.values())
-            if(a.getType() == material)
-                return true;
-        return false;
-    }
-
-    public static int calculateArmorPoints(int[] armor) {
-        int total = 0;
-        for (int anArmor : armor) {
-            if (anArmor != -1)
-                total += findById(anArmor).getArmorPoints();
-        }
-        return total;
-    }
-
-    public Material getType() {
-        return this.type;
-    }
-
+package us.myles.ViaVersion.protocols.protocol1_9to1_8;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.HashMap;
+
+@RequiredArgsConstructor
+@Getter
+public enum ArmorType {
+
+    LEATHER_HELMET(1, 298, Material.LEATHER_HELMET),
+    LEATHER_CHESTPLATE(3, 299, Material.LEATHER_CHESTPLATE),
+    LEATHER_LEGGINGS(2, 300, Material.LEATHER_LEGGINGS),
+    LEATHER_BOOTS(1, 301, Material.LEATHER_BOOTS),
+    CHAINMAIL_HELMET(2, 302, Material.CHAINMAIL_HELMET),
+    CHAINMAIL_CHESTPLATE(5, 303, Material.CHAINMAIL_CHESTPLATE),
+    CHAINMAIL_LEGGINGS(4, 304, Material.CHAINMAIL_LEGGINGS),
+    CHAINMAIL_BOOTS(1, 305, Material.CHAINMAIL_BOOTS),
+    IRON_HELMET(2, 306, Material.IRON_HELMET),
+    IRON_CHESTPLATE(6, 307, Material.IRON_CHESTPLATE),
+    IRON_LEGGINGS(5, 308, Material.IRON_LEGGINGS),
+    IRON_BOOTS(2, 309, Material.IRON_BOOTS),
+    DIAMOND_HELMET(3, 310, Material.DIAMOND_HELMET),
+    DIAMOND_CHESTPLATE(8, 311, Material.DIAMOND_CHESTPLATE),
+    DIAMOND_LEGGINGS(6, 312, Material.DIAMOND_LEGGINGS),
+    DIAMOND_BOOTS(3, 313, Material.DIAMOND_BOOTS),
+    GOLD_HELMET(2, 314, Material.GOLD_HELMET),
+    GOLD_CHESTPLATE(5, 315, Material.GOLD_CHESTPLATE),
+    GOLD_LEGGINGS(3, 316, Material.GOLD_LEGGINGS),
+    GOLD_BOOTS(1, 317, Material.GOLD_BOOTS),
+    NONE(0, 0, Material.AIR);
+
+    private static HashMap<Material, ArmorType> armor;
+
+    static {
+        armor = new HashMap<Material, ArmorType>();
+        for (ArmorType a : ArmorType.values()) {
+            armor.put(a.getType(), a);
+        }
+    }
+
+    private final int armorPoints;
+    private final int id;
+    private final Material type;
+
+    public static ArmorType findByType(Material type) {
+        ArmorType t = armor.get(type);
+        return t == null ? ArmorType.NONE : t;
+    }
+
+    public static int calculateArmorPoints(ItemStack[] armor) {
+        int total = 0;
+        for (ItemStack anArmor : armor) {
+            if (anArmor != null)
+                total += findByType(anArmor.getType()).getArmorPoints();
+        }
+        return total;
+    }
+
+    public static ArmorType findById(int id) {
+        for (ArmorType a : ArmorType.values())
+            if (a.getId() == id)
+                return a;
+        return ArmorType.NONE;
+    }
+
+    public static boolean isArmor(Material material) {
+        for (ArmorType a : ArmorType.values())
+            if (a.getType() == material)
+                return true;
+        return false;
+    }
+
+    public static int calculateArmorPoints(int[] armor) {
+        int total = 0;
+        for (int anArmor : armor) {
+            if (anArmor != -1)
+                total += findById(anArmor).getArmorPoints();
+        }
+        return total;
+    }
+
+    public Material getType() {
+        return this.type;
+    }
+
 }

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

@@ -1,21 +1,17 @@
-package us.myles.ViaVersion.slot;
+package us.myles.ViaVersion.protocols.protocol1_9to1_8;
 
-import io.netty.buffer.ByteBuf;
 import org.bukkit.Material;
 import org.spacehq.opennbt.tag.builtin.CompoundTag;
 import org.spacehq.opennbt.tag.builtin.ListTag;
 import org.spacehq.opennbt.tag.builtin.StringTag;
 import org.spacehq.opennbt.tag.builtin.Tag;
-import us.myles.ViaVersion.CancelException;
-import us.myles.ViaVersion.transformers.OutgoingTransformer;
-import us.myles.ViaVersion.util.PacketUtil;
+import us.myles.ViaVersion.api.minecraft.item.Item;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ItemSlotRewriter {
+public class ItemRewriter {
 
     private static final Map<String, Integer> ENTTIY_NAME_TO_ID = new HashMap<>();
     private static final Map<Integer, String> ENTTIY_ID_TO_NAME = new HashMap<>();
@@ -116,7 +112,7 @@ public class ItemSlotRewriter {
         registerPotion(8205, "water_breathing");
         registerPotion(8269, "long_water_breathing");
 
-        registerPotion(8197, "healing");
+        registerPotion(8261, "healing");
         registerPotion(8229, "strong_healing");
 
         registerPotion(8204, "harming");
@@ -139,34 +135,10 @@ public class ItemSlotRewriter {
 
     }
 
-    public static void rewrite1_9To1_8(ByteBuf input, ByteBuf output) throws CancelException {
-        try {
-            ItemStack item = readItemStack(input);
-            fixIdsFrom1_9To1_8(item);
-            writeItemStack(item, output);
-        } catch (Exception e) {
-            System.out.println("Error while rewriting an item slot.");
-            e.printStackTrace();
-            throw new CancelException();
-        }
-    }
-
-    public static void rewrite1_8To1_9(ByteBuf input, ByteBuf output) throws CancelException {
-        try {
-            ItemStack item = readItemStack(input);
-            fixIdsFrom1_8To1_9(item);
-            writeItemStack(item, output);
-        } catch (Exception e) {
-            System.out.println("Error while rewriting an item slot.");
-            e.printStackTrace();
-            throw new CancelException();
-        }
-    }
-
-    public static void fixIdsFrom1_9To1_8(ItemStack item) {
+    public static void toServer(Item item) {
         if (item != null) {
-            if (item.id == Material.MONSTER_EGG.getId() && item.data == 0) {
-                CompoundTag tag = item.tag;
+            if (item.getId() == Material.MONSTER_EGG.getId() && item.getData() == 0) {
+                CompoundTag tag = item.getTag();
                 int data = 0;
                 if (tag != null && tag.get("EntityTag") instanceof CompoundTag) {
                     CompoundTag entityTag = tag.get("EntityTag");
@@ -176,11 +148,11 @@ public class ItemSlotRewriter {
                             data = ENTTIY_NAME_TO_ID.get(id.getValue());
                     }
                 }
-                item.tag = null;
-                item.data = (short) data;
+                item.setTag(null);
+                item.setData((short) data);
             }
-            if (item.id == Material.POTION.getId()) {
-                CompoundTag tag = item.tag;
+            if (item.getId() == Material.POTION.getId()) {
+                CompoundTag tag = item.getTag();
                 int data = 0;
                 if (tag != null && tag.get("Potion") instanceof StringTag) {
                     StringTag potion = tag.get("Potion");
@@ -189,13 +161,13 @@ public class ItemSlotRewriter {
                         data = POTION_NAME_TO_ID.get(potionName);
                     }
                 }
-                item.tag = null;
-                item.data = (short) data;
+                item.setTag(null);
+                item.setData((short) data);
             }
-            if (item.id == 438) {
-                CompoundTag tag = item.tag;
+            if (item.getId() == 438) {
+                CompoundTag tag = item.getTag();
                 int data = 0;
-                item.id = (short) Material.POTION.getId();
+                item.setId((short) Material.POTION.getId());
                 if (tag != null && tag.get("Potion") instanceof StringTag) {
                     StringTag potion = tag.get("Potion");
                     String potionName = potion.getValue().replace("minecraft:", "");
@@ -203,55 +175,55 @@ public class ItemSlotRewriter {
                         data = POTION_NAME_TO_ID.get(potionName) + 8192;
                     }
                 }
-                item.tag = null;
-                item.data = (short) data;
+                item.setTag(null);
+                item.setData((short) data);
             }
         }
     }
 
-    public static void fixIdsFrom1_8To1_9(ItemStack item) {
+    public static void toClient(Item item) {
         if (item != null) {
-            if (item.id == Material.MONSTER_EGG.getId() && item.data != 0) {
-                CompoundTag tag = item.tag;
+            if (item.getId() == Material.MONSTER_EGG.getId() && item.getData() != 0) {
+                CompoundTag tag = item.getTag();
                 if (tag == null) {
                     tag = new CompoundTag("tag");
                 }
                 CompoundTag entityTag = new CompoundTag("EntityTag");
-                if (ENTTIY_ID_TO_NAME.containsKey((int) item.data)) {
-                    StringTag id = new StringTag("id", ENTTIY_ID_TO_NAME.get((int) item.data));
+                if (ENTTIY_ID_TO_NAME.containsKey((int) item.getData())) {
+                    StringTag id = new StringTag("id", ENTTIY_ID_TO_NAME.get((int) item.getData()));
                     entityTag.put(id);
                     tag.put(entityTag);
                 }
-                item.tag = tag;
-                item.data = 0;
+                item.setTag(tag);
+                item.setData((short) 0);
             }
-            if (item.id == Material.POTION.getId()) {
-                CompoundTag tag = item.tag;
+            if (item.getId() == Material.POTION.getId()) {
+                CompoundTag tag = item.getTag();
                 if (tag == null) {
                     tag = new CompoundTag("tag");
                 }
-                if (item.data >= 16384) {
-                    item.id = 438; // splash id
-                    item.data = (short) (item.data - 8192);
+                if (item.getData() >= 16384) {
+                    item.setId((short) 438); // splash id
+                    item.setData((short) (item.getData() - 8192));
                 }
-                if (POTION_ID_TO_NAME.containsKey((int) item.data)) {
-                    String name = POTION_ID_TO_NAME.get((int) item.data);
+                if (POTION_ID_TO_NAME.containsKey((int) item.getData())) {
+                    String name = POTION_ID_TO_NAME.get((int) item.getData());
                     StringTag potion = new StringTag("Potion", "minecraft:" + name);
                     tag.put(potion);
                 }
-                item.tag = tag;
-                item.data = 0;
+                item.setTag(tag);
+                item.setData((short) 0);
             }
-            if (item.id == Material.WRITTEN_BOOK.getId()) {
-                CompoundTag tag = item.tag;
+            if (item.getId() == Material.WRITTEN_BOOK.getId()) {
+                CompoundTag tag = item.getTag();
                 if (tag == null) {
                     tag = new CompoundTag("tag");
                 }
                 ListTag pages = tag.get("pages");
                 if (pages == null) {
-                    pages = new ListTag("pages", Collections.<Tag>singletonList(new StringTag(OutgoingTransformer.fixJson(""))));
+                    pages = new ListTag("pages", Collections.<Tag>singletonList(new StringTag(Protocol1_9TO1_8.fixJson(""))));
                     tag.put(pages);
-                    item.tag = tag;
+                    item.setTag(tag);
                     return;
                 }
 
@@ -259,39 +231,13 @@ public class ItemSlotRewriter {
                     if (!(pages.get(i) instanceof StringTag))
                         continue;
                     StringTag page = pages.get(i);
-                    page.setValue(OutgoingTransformer.fixJson(page.getValue()));
+                    page.setValue(Protocol1_9TO1_8.fixJson(page.getValue()));
                 }
-                item.tag = tag;
+                item.setTag(tag);
             }
         }
     }
 
-    public static ItemStack readItemStack(ByteBuf input) throws IOException {
-        short id = input.readShort();
-        if (id < 0) {
-
-            return null;
-        } else {
-            ItemStack item = new ItemStack();
-            item.id = id;
-            item.amount = input.readByte();
-            item.data = input.readShort();
-            item.tag = PacketUtil.readNBT(input);
-            return item;
-        }
-    }
-
-    public static void writeItemStack(ItemStack item, ByteBuf output) throws IOException {
-        if (item == null) {
-            output.writeShort(-1);
-        } else {
-            output.writeShort(item.id);
-            output.writeByte(item.amount);
-            output.writeShort(item.data);
-            PacketUtil.writeNBT(output, item.tag);
-        }
-    }
-
     private static void registerEntity(Integer id, String name) {
         ENTTIY_ID_TO_NAME.put(id, name);
         ENTTIY_NAME_TO_ID.put(name, id);
@@ -301,22 +247,4 @@ public class ItemSlotRewriter {
         POTION_ID_TO_NAME.put(id, name);
         POTION_NAME_TO_ID.put(name, id);
     }
-
-    public static class ItemStack {
-
-        public short id;
-        public byte amount;
-        public short data;
-        public CompoundTag tag;
-
-        public static ItemStack fromBukkit(org.bukkit.inventory.ItemStack stack) {
-            if(stack == null) return null;
-            ItemStack item = new ItemStack();
-            item.id = (short) stack.getTypeId();
-            item.amount = (byte) stack.getAmount();
-            item.data = stack.getData().getData();
-            // TODO: nbt
-            return item;
-        }
-    }
 }

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

@@ -0,0 +1,18 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.MovementTracker;
+
+public class PlayerMovementMapper extends PacketRemapper {
+    @Override
+    public void registerMap() {
+        handler(new PacketHandler() {
+            @Override
+            public void handle(PacketWrapper wrapper) throws Exception {
+                wrapper.user().get(MovementTracker.class).incrementIdlePacket();
+            }
+        });
+    }
+}

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

@@ -0,0 +1,129 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import org.bukkit.Bukkit;
+import org.bukkit.inventory.ItemStack;
+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.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.protocols.base.ProtocolInfo;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.ArmorListener;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.BlockListener;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.CommandBlockListener;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.PaperPatch;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.packets.*;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.ClientChunks;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.InventoryTracker;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.MovementTracker;
+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;
+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();
+    private static Gson gson = new GsonBuilder().create();
+    public static ValueTransformer<String, String> FIX_JSON = new ValueTransformer<String, String>(Type.STRING) {
+        @Override
+        public String transform(PacketWrapper wrapper, String line) {
+            return fixJson(line);
+        }
+    };
+
+    public static String fixJson(String line) {
+        if (line == null || line.equalsIgnoreCase("null")) {
+            line = "{\"text\":\"\"}";
+        } else {
+            if ((!line.startsWith("\"") || !line.endsWith("\"")) && (!line.startsWith("{") || !line.endsWith("}"))) {
+                JsonObject jsonObject = new JsonObject();
+                jsonObject.addProperty("text", line);
+                return gson.toJson(jsonObject);
+            }
+            if (line.startsWith("\"") && line.endsWith("\"")) {
+                line = "{\"text\":" + line + "}";
+            }
+        }
+        try {
+            gson.fromJson(line, JsonObject.class);
+        } catch (Exception e) {
+            System.out.println("Invalid JSON String: \"" + line + "\" Please report this issue to the ViaVersion Github: " + e.getMessage());
+            return "{\"text\":\"\"}";
+        }
+        return line;
+    }
+
+    public static ItemStack getHandItem(final UserConnection info) {
+        try {
+            return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<ItemStack>() {
+                @Override
+                public ItemStack call() throws Exception {
+                    UUID playerUUID = info.get(ProtocolInfo.class).getUuid();
+                    if (Bukkit.getPlayer(playerUUID) != null) {
+                        return Bukkit.getPlayer(playerUUID).getItemInHand();
+                    }
+                    return null;
+                }
+            }).get(10, TimeUnit.SECONDS);
+        } catch (Exception e) {
+            System.out.println("Error fetching hand item: " + e.getClass().getName());
+            if (ViaVersion.getInstance().isDebug())
+                e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    protected void registerPackets() {
+        SpawnPackets.register(this);
+        InventoryPackets.register(this);
+        EntityPackets.register(this);
+        PlayerPackets.register(this);
+        WorldPackets.register(this);
+    }
+
+    @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 BlockListener(plugin), plugin);
+        if(Bukkit.getVersion().toLowerCase().contains("paper")){
+            plugin.getLogger().info("Enabling PaperSpigot patch: Fixes block placement.");
+            Bukkit.getPluginManager().registerEvents(new PaperPatch(), plugin);
+        }
+    }
+
+    @Override
+    public boolean isFiltered(Class packetClass) {
+        return packetClass.getName().endsWith("PacketPlayOutMapChunkBulk");
+    }
+
+    @Override
+    protected void filterPacket(UserConnection info, Object packet, List output) throws Exception {
+        output.addAll(info.get(ClientChunks.class).transformMapChunkBulk(packet));
+    }
+
+    @Override
+    public void init(UserConnection userConnection) {
+        // Entity tracker
+        userConnection.put(new EntityTracker(userConnection));
+        // Chunk tracker
+        userConnection.put(new ClientChunks(userConnection));
+        // Movement tracker
+        userConnection.put(new MovementTracker(userConnection));
+        // Inventory tracker
+        userConnection.put(new InventoryTracker(userConnection));
+    }
+}

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

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.armor;
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -11,17 +11,21 @@ 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;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.CraftingInventory;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
-import us.myles.ViaVersion.packets.PacketType;
+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.ArmorType;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
 import java.util.UUID;
 
-import static us.myles.ViaVersion.util.PacketUtil.*;
-
 @RequiredArgsConstructor
 public class ArmorListener implements Listener {
 
@@ -29,20 +33,27 @@ public class ArmorListener implements Listener {
     private final ViaVersionPlugin plugin;
 
     public static 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;
+
         int armor = ArmorType.calculateArmorPoints(player.getInventory().getArmorContents());
+        try {
+            ByteBuf buf = Unpooled.buffer();
+            Type.VAR_INT.write(buf, 0x4B); // Entity Properties
+            Type.VAR_INT.write(buf, player.getEntityId());
+            buf.writeInt(1); // only 1 property
+            Type.STRING.write(buf, "generic.armor");
+            buf.writeDouble(0); //default 0 armor
+            Type.VAR_INT.write(buf, 1); // 1 modifier
+            Type.UUID.write(buf, ARMOR_ATTRIBUTE); // armor modifier uuid
+            buf.writeDouble((double) armor); // the modifier value
+            buf.writeByte(0); // the modifier operation, 0 is add number
 
-        ByteBuf buf = Unpooled.buffer();
-        writeVarInt(PacketType.PLAY_ENTITY_PROPERTIES.getNewPacketID(), buf);
-        writeVarInt(player.getEntityId(), buf);
-        buf.writeInt(1); // only 1 property
-        writeString("generic.armor", buf);
-        buf.writeDouble(0); //default 0 armor
-        writeVarInt(1, buf); // 1 modifier
-        writeUUID(ARMOR_ATTRIBUTE, buf); // armor modifier uuid
-        buf.writeDouble((double) armor); // the modifier value
-        buf.writeByte(0); // the modifier operation, 0 is add number
-
-        ViaVersion.getInstance().sendRawPacket(player, buf);
+            ViaVersion.getInstance().sendRawPacket(player, buf);
+        } catch (Exception ignored) {
+        }
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -68,18 +79,16 @@ public class ArmorListener implements Listener {
     public void onInteract(PlayerInteractEvent e) {
         if (e.getItem() != null) {
             if (e.getAction() == Action.RIGHT_CLICK_AIR || e.getAction() == Action.RIGHT_CLICK_BLOCK) {
-                if (ArmorType.isArmor(e.getMaterial())) {
-                    final Player player = e.getPlayer();
-                    // Due to odd bugs it's 3 ticks later
-                    Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
-                        @Override
-                        public void run() {
-                            if (ViaVersion.getInstance().isPorted(player)) {
-                                sendArmorUpdate(player);
-                            }
+                final Player player = e.getPlayer();
+                // Due to odd bugs it's 3 ticks later
+                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
+                    @Override
+                    public void run() {
+                        if (ViaVersion.getInstance().isPorted(player)) {
+                            sendArmorUpdate(player);
                         }
-                    }, 3L);
-                }
+                    }
+                }, 3L);
             }
         }
     }
@@ -89,6 +98,18 @@ public class ArmorListener implements Listener {
         sendDelayedArmorUpdate(e.getPlayer());
     }
 
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onRespawn(PlayerRespawnEvent e) {
+        if (ViaVersion.getInstance().isPorted(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());
+    }
+
     public void sendDelayedArmorUpdate(final Player player) {
         Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
             @Override

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

@@ -0,0 +1,30 @@
+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.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 {
+
+    private final ViaVersionPlugin plugin;
+
+    @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;
+            Block b = e.getBlockPlaced();
+            plugin.getConnection(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

@@ -0,0 +1,141 @@
+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;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.spacehq.opennbt.tag.builtin.ByteTag;
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
+import us.myles.ViaVersion.ViaVersionPlugin;
+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.base.ProtocolInfo;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+import us.myles.ViaVersion.util.ReflectionUtil;
+
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.lang.reflect.Method;
+
+@RequiredArgsConstructor
+public class CommandBlockListener implements Listener {
+
+    private final ViaVersionPlugin plugin;
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+    public void onJoin(PlayerJoinEvent e) {
+        sendOp(e.getPlayer());
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onRespawn(final PlayerRespawnEvent e) {
+        Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
+            @Override
+            public void run() {
+                sendOp(e.getPlayer());
+            }
+        }, 1L);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onWorldChange(PlayerChangedWorldEvent e) {
+        sendOp(e.getPlayer());
+    }
+
+    @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;
+
+            try {
+                sendCommandBlockPacket(e.getClickedBlock(), e.getPlayer());
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    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;
+
+            try {
+                ByteBuf buf = Unpooled.buffer();
+                Type.VAR_INT.write(buf, 0x1B); // Entity Status
+                buf.writeInt(p.getEntityId());
+                buf.writeByte(26);
+                plugin.sendRawPacket(p, buf);
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    private void sendCommandBlockPacket(Block b, Player player) throws Exception {
+        if (!(b.getState() instanceof CommandBlock))
+            return;
+        CommandBlock cmd = (CommandBlock) b.getState();
+
+        Object tileEntityCommand = ReflectionUtil.get(cmd, "commandBlock", ReflectionUtil.nms("TileEntityCommand"));
+        Object updatePacket = ReflectionUtil.invoke(tileEntityCommand, "getUpdatePacket");
+        ByteBuf buf = packetToByteBuf(updatePacket);
+        plugin.sendRawPacket(player, buf);
+    }
+
+    private ByteBuf packetToByteBuf(Object updatePacket) throws Exception {
+        ByteBuf buf = Unpooled.buffer();
+        Type.VAR_INT.write(buf, 0x09); //Block Entity Packet ID
+        long[] pos = getPosition(ReflectionUtil.get(updatePacket, "a", ReflectionUtil.nms("BlockPosition")));
+        Type.POSITION.write(buf, new Position(pos[0], pos[1], pos[2])); //Block position
+        buf.writeByte(2); //Action id always 2
+        CompoundTag nbt = getNBT(ReflectionUtil.get(updatePacket, "c", ReflectionUtil.nms("NBTTagCompound")));
+        if (nbt == null) {
+            buf.writeByte(0); //If nbt is null. Use 0 as nbt
+            return buf;
+        }
+        nbt.put(new ByteTag("powered", (byte) 0));
+        nbt.put(new ByteTag("auto", (byte) 0));
+        nbt.put(new ByteTag("conditionMet", (byte) 0));
+        Type.NBT.write(buf, nbt); //NBT tag
+        return buf;
+    }
+
+    private long[] getPosition(Object obj) throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
+        return new long[]{
+                (long) ReflectionUtil.getSuper(obj, "a", int.class), //X
+                (long) ReflectionUtil.getSuper(obj, "c", int.class), //Y
+                (long) ReflectionUtil.getSuper(obj, "d", int.class)  //Z
+        };
+    }
+
+    private CompoundTag getNBT(Object obj) throws Exception {
+        ByteBuf buf = Unpooled.buffer();
+        Method m = ReflectionUtil.nms("NBTCompressedStreamTools").getMethod("a", ReflectionUtil.nms("NBTTagCompound"), DataOutput.class);
+        m.invoke(null, obj, new DataOutputStream(new ByteBufOutputStream(buf)));
+        try {
+            return Type.NBT.read(buf);
+        } finally {
+            buf.release();
+        }
+    }
+}
+

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

@@ -0,0 +1,55 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners;
+
+import org.bukkit.Location;
+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.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+
+public class PaperPatch implements Listener {
+
+    /*
+    This patch is applied when Paper is detected.
+    I'm unsure of what causes this but essentially,
+    placing blocks where your 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;
+            Location diff = e.getPlayer().getLocation().subtract(e.getBlock().getLocation().add(0.5D, 0, 0.5D));
+            if (e.getPlayer().getLocation().getBlock().equals(e.getBlock())) {
+                e.setCancelled(true);
+            } else {
+                if (e.getPlayer().getLocation().getBlock().getRelative(BlockFace.UP).equals(e.getBlock())) {
+                    e.setCancelled(true);
+                }else{
+                    // Within radius of block
+                    if(Math.abs(diff.getX()) <= 0.8 && Math.abs(diff.getZ()) <= 0.8D){
+                        // Are they on the edge / shifting ish
+                        if(diff.getY() <= 0.1D && diff.getY() >= -0.1D){
+                            e.setCancelled(true);
+                            return;
+                        }
+                        BlockFace relative = e.getBlockAgainst().getFace(e.getBlock());
+                        // Are they towering up, (handles some latency)
+                        if(relative == BlockFace.UP){
+                            if(diff.getY() <= 1.1D && diff.getY() >= 0D){
+                                e.setCancelled(true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetaIndex.java

@@ -1,183 +1,192 @@
-package us.myles.ViaVersion.metadata;
-
-import lombok.Getter;
-import org.bukkit.entity.*;
-
-@Getter
-public enum MetaIndex {
-
-    // entity
-    ENTITY_STATUS(org.bukkit.entity.Entity.class, 0, Type.Byte, NewType.Byte),
-    ENTITY_AIR(org.bukkit.entity.Entity.class, 1, Type.Short, NewType.VarInt),
-    ENTITY_SILENT(org.bukkit.entity.Entity.class, 4, Type.Byte, NewType.Boolean),
-    // living entity
-    LIVINGENTITY_NAMETAG(LivingEntity.class, 2, Type.String, NewType.String),
-    LIVINGENTITY_ALWAYS_SHOW_NAMETAG(LivingEntity.class, 3, Type.Byte, NewType.Boolean),
-    LIVINGENTITY_HEALTH(LivingEntity.class, 6, Type.Float, NewType.Float),
-    LIVINGENTITY_POTION_EFFECT_COLOR(LivingEntity.class, 7, Type.Int, NewType.VarInt),
-    LIVINGENTITY_IS_POTION_AMBIENT(LivingEntity.class, 8, Type.Byte, NewType.Boolean),
-    LIVINGENTITY_NUMBER_OF_ARROWS_IN(LivingEntity.class, 9, Type.Byte, NewType.VarInt),
-    LIVINGENTITY_NO_AI(LivingEntity.class, 15, Type.Byte, 10, NewType.Byte), // in 1.9 this is combined with Left handed, oh.
-    // ageable
-    AGEABLE_AGE(Ageable.class, 12, Type.Byte, 11, NewType.Boolean),
-    // armour stand
-    STAND_INFO(ArmorStand.class, 10, Type.Byte, NewType.Byte),
-    STAND_HEAD_POS(ArmorStand.class, 11, Type.Rotation, NewType.Vector3F),
-    STAND_BODY_POS(ArmorStand.class, 12, Type.Rotation, NewType.Vector3F),
-    STAND_LA_POS(ArmorStand.class, 13, Type.Rotation, NewType.Vector3F),
-    STAND_RA_POS(ArmorStand.class, 14, Type.Rotation, NewType.Vector3F),
-    STAND_LL_POS(ArmorStand.class, 15, Type.Rotation, NewType.Vector3F),
-    STAND_RL_POS(ArmorStand.class, 16, Type.Rotation, NewType.Vector3F),
-    // human, discountined?
-    PLAYER_SKIN_FLAGS(HumanEntity.class, 10, Type.Byte, 12, NewType.Byte), // unsigned on 1.8
-    PLAYER_HUMAN_BYTE(HumanEntity.class, 16, Type.Byte, NewType.Discontinued), // unused on 1.8
-    PLAYER_ADDITIONAL_HEARTS(HumanEntity.class, 17, Type.Float, 10, NewType.Float),
-    PLAYER_SCORE(HumanEntity.class, 18, Type.Int, 11, NewType.VarInt),
-    PLAYER_HAND(HumanEntity.class, -1, Type.NonExistent, 5, NewType.Byte), // new in 1.9
-    // horse
-    HORSE_INFO(Horse.class, 16, Type.Int, 12, NewType.Byte),
-    HORSE_TYPE(Horse.class, 19, Type.Byte, 13, NewType.VarInt),
-    HORSE_SUBTYPE(Horse.class, 20, Type.Int, 14, NewType.VarInt),
-    HORSE_OWNER(Horse.class, 21, Type.String, 15, NewType.OptUUID),
-    HORSE_ARMOR(Horse.class, 22, Type.Int, 16, NewType.VarInt),
-    // bat
-    BAT_ISHANGING(Bat.class, 16, Type.Byte, 11, NewType.Byte),
-    // tameable
-    TAMING_INFO(Tameable.class, 16, Type.Byte, 12, NewType.Byte),
-    TAMING_OWNER(Tameable.class, 17, Type.String, 13, NewType.OptUUID),
-    // ocelot
-    OCELOT_TYPE(Ocelot.class, 18, Type.Byte, 14, NewType.VarInt),
-    // wolf
-    WOLF_HEALTH(Wolf.class, 18, Type.Float, 14, NewType.Float),
-    WOLF_BEGGING(Wolf.class, 19, Type.Byte, 15, NewType.Boolean),
-    WOLF_COLLAR(Wolf.class, 20, Type.Byte, 16, NewType.VarInt),
-    // pig
-    PIG_SADDLE(Pig.class, 16, Type.Byte, 12, NewType.Boolean),
-    // rabbit
-    RABBIT_TYPE(Rabbit.class, 18, Type.Byte, 12, NewType.VarInt),
-    // sheep
-    SHEEP_COLOR(Sheep.class, 16, Type.Byte, 12, NewType.Byte),
-    // villager
-    VILLAGER_PROFESSION(Villager.class, 16, Type.Int, 12, NewType.VarInt), // TODO write this to wiki.vg
-    // enderman
-    ENDERMAN_BLOCK(Enderman.class, 16, Type.Short, 11, NewType.BlockID), // special case
-    ENDERMAN_BLOCKDATA(Enderman.class, 17, Type.Byte, 11, NewType.BlockID), // special case
-    ENDERMAN_ISSCREAMING(Enderman.class, 18, Type.Byte, 12, NewType.Boolean),
-    // zombie
-    ZOMBIE_ISCHILD(Zombie.class, 12, Type.Byte, 11, NewType.Boolean),
-    ZOMBIE_ISVILLAGER(Zombie.class, 13, Type.Byte, 12, NewType.VarInt),
-    ZOMBIE_ISCONVERTING(Zombie.class, 14, Type.Byte, 13, NewType.Boolean),
-    // ZOMBIE_RISINGHANDS added in 1.9
-    // blaze
-    BLAZE_ONFIRE(Blaze.class, 16, Type.Byte, 11, NewType.Byte),
-    // spider
-    SPIDER_CIMBING(Spider.class, 16, Type.Byte, 11, NewType.Byte),
-    // creeper
-    CREEPER_FUSE(Creeper.class, 16, Type.Byte, 11, NewType.VarInt), // -1 idle, 1 is fuse
-    CREEPER_ISPOWERED(Creeper.class, 17, Type.Byte, 12, NewType.Boolean),
-    CREEPER_ISIGNITED(Creeper.class, 18, Type.Byte, 13, NewType.Boolean),
-    // ghast
-    GHAST_ISATTACKING(Ghast.class, 16, Type.Byte, 11, NewType.Boolean),
-    // slime
-    SLIME_SIZE(Slime.class, 16, Type.Byte, 11, NewType.VarInt),
-    // skeleton
-    SKELETON_TYPE(Skeleton.class, 13, Type.Byte, 11, NewType.VarInt),
-    // witch
-    WITCH_AGGRO(Witch.class, 21, Type.Byte, 11, NewType.Boolean),
-    // iron golem
-    IRON_PLAYERMADE(IronGolem.class, 16, Type.Byte, 11, NewType.Byte),
-    // wither
-    WITHER_TARGET1(Wither.class, 17, Type.Int, 11, NewType.VarInt),
-    WITHER_TARGET2(Wither.class, 18, Type.Int, 12, NewType.VarInt),
-    WITHER_TARGET3(Wither.class, 19, Type.Int, 13, NewType.VarInt),
-    WITHER_INVULN_TIME(Wither.class, 20, Type.Int, 14, NewType.VarInt),
-    // wither skull
-    WITHERSKULL_INVULN(WitherSkull.class, 10, Type.Byte, 5, NewType.Boolean),
-    // guardian
-    GUARDIAN_INFO(Guardian.class, 16, Type.Int, 11, NewType.Byte),
-    GUARDIAN_TARGET(Guardian.class, 17, Type.Int, 12, NewType.VarInt),
-    // boat
-    BOAT_SINCEHIT(Boat.class, 17, Type.Int, 5, NewType.VarInt),
-    BOAT_FORWARDDIR(Boat.class, 18, Type.Int, 6, NewType.VarInt),
-    BOAT_DMGTAKEN(Boat.class, 19, Type.Float, 7, NewType.Float),
-    // BOAT_TYPE in 1.9
-    // minecart
-    MINECART_SHAKINGPOWER(Minecart.class, 17, Type.Int, 5, NewType.VarInt),
-    MINECART_SHAKINGDIRECTION(Minecart.class, 18, Type.Int, 6, NewType.VarInt),
-    MINECART_DAMAGETAKEN(Minecart.class, 19, Type.Float, 7, NewType.Float), // also shaking modifier :P
-    MINECART_BLOCK(Minecart.class, 20, Type.Int, 8, NewType.VarInt),
-    MINECART_BLOCK_Y(Minecart.class, 21, Type.Int, 9, NewType.VarInt),
-    MINECART_SHOWBLOCK(Minecart.class, 22, Type.Byte, 10, NewType.Boolean),
-    // Command minecart (they are still broken)
-    MINECART_COMMANDBLOCK_COMMAND(Minecart.class, 23, Type.String, 11, NewType.String),
-    MINECART_COMMANDBLOCK_OUTPUT(Minecart.class, 24, Type.String, 12, NewType.Chat),
-    // furnace cart
-    FURNACECART_ISPOWERED(Minecart.class, 16, Type.Byte, 11, NewType.Boolean),
-    // item drop
-    ITEM_ITEM(Item.class, 10, Type.Slot, 5, NewType.Slot),
-    // arrow
-    ARROW_ISCRIT(Arrow.class, 16, Type.Byte, 5, NewType.Byte),
-    // firework
-    FIREWORK_INFO(Firework.class, 8, Type.Slot, 5, NewType.Slot),
-    // item frame
-    ITEMFRAME_ITEM(ItemFrame.class, 8, Type.Slot, 5, NewType.Slot),
-    ITEMFRAME_ROTATION(ItemFrame.class, 9, Type.Byte, 6, NewType.VarInt),
-    // ender crystal
-    ENDERCRYSTAL_HEALTH(EnderCrystal.class, 8, Type.Int, NewType.Discontinued),;
-
-    private Class<?> clazz;
-    private int newIndex;
-    private NewType newType;
-    private Type oldType;
-    private int index;
-
-    MetaIndex(Class<?> type, int index, Type oldType, NewType newType) {
-        this.clazz = type;
-        this.index = index;
-        this.newIndex = index;
-        this.oldType = oldType;
-        this.newType = newType;
-    }
-
-    MetaIndex(Class<?> type, int index, Type oldType, int newIndex, NewType newType) {
-        this.clazz = type;
-        this.index = index;
-        this.oldType = oldType;
-        this.newIndex = newIndex;
-        this.newType = newType;
-    }
-
-    public static MetaIndex getIndex(EntityType type, int index) {
-        Class<? extends org.bukkit.entity.Entity> entityClass = type.getEntityClass();
-        if (entityClass == null) {
-            System.out.println("Could not get entity class for " + type);
-            return null;
-        }
-        for (MetaIndex mi : MetaIndex.values()) {
-            if (mi.getIndex() == index) {
-                // To fix issue with armour stands colliding with new values
-                if (mi.getApplicableClass().equals(LivingEntity.class)) continue;
-
-                if ((mi.getApplicableClass().isAssignableFrom(entityClass) ||
-                        mi.getApplicableClass().equals(entityClass))) {
-                    return mi;
-                }
-            }
-        }
-        // fall back to living entity
-        for (MetaIndex mi : MetaIndex.values()) {
-            if (mi.getIndex() == index) {
-                if (mi.getApplicableClass().isAssignableFrom(LivingEntity.class) ||
-                        mi.getApplicableClass().equals(LivingEntity.class)) {
-                    return mi;
-                }
-            }
-        }
-        return null;
-    }
-
-    public Class<?> getApplicableClass() {
-        return this.clazz;
-    }
-}
-
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata;
+
+import lombok.Getter;
+import org.bukkit.entity.*;
+
+@Getter
+public enum MetaIndex {
+
+    // entity
+    ENTITY_STATUS(org.bukkit.entity.Entity.class, 0, Type.Byte, NewType.Byte),
+    ENTITY_AIR(org.bukkit.entity.Entity.class, 1, Type.Short, NewType.VarInt),
+    ENTITY_SILENT(org.bukkit.entity.Entity.class, 4, Type.Byte, NewType.Boolean),
+    // living entity
+    LIVINGENTITY_NAMETAG(LivingEntity.class, 2, Type.String, NewType.String),
+    LIVINGENTITY_ALWAYS_SHOW_NAMETAG(LivingEntity.class, 3, Type.Byte, NewType.Boolean),
+    LIVINGENTITY_HEALTH(LivingEntity.class, 6, Type.Float, NewType.Float),
+    LIVINGENTITY_POTION_EFFECT_COLOR(LivingEntity.class, 7, Type.Int, NewType.VarInt),
+    LIVINGENTITY_IS_POTION_AMBIENT(LivingEntity.class, 8, Type.Byte, NewType.Boolean),
+    LIVINGENTITY_NUMBER_OF_ARROWS_IN(LivingEntity.class, 9, Type.Byte, NewType.VarInt),
+    LIVINGENTITY_NO_AI(LivingEntity.class, 15, Type.Byte, 10, NewType.Byte), // in 1.9 this is combined with Left handed, oh.
+    // ageable
+    AGEABLE_AGE(Ageable.class, 12, Type.Byte, 11, NewType.Boolean),
+    // armour stand
+    STAND_INFO(ArmorStand.class, 10, Type.Byte, NewType.Byte),
+    STAND_HEAD_POS(ArmorStand.class, 11, Type.Rotation, NewType.Vector3F),
+    STAND_BODY_POS(ArmorStand.class, 12, Type.Rotation, NewType.Vector3F),
+    STAND_LA_POS(ArmorStand.class, 13, Type.Rotation, NewType.Vector3F),
+    STAND_RA_POS(ArmorStand.class, 14, Type.Rotation, NewType.Vector3F),
+    STAND_LL_POS(ArmorStand.class, 15, Type.Rotation, NewType.Vector3F),
+    STAND_RL_POS(ArmorStand.class, 16, Type.Rotation, NewType.Vector3F),
+    // human, discountined?
+    PLAYER_SKIN_FLAGS(HumanEntity.class, 10, Type.Byte, 12, NewType.Byte), // unsigned on 1.8
+    PLAYER_HUMAN_BYTE(HumanEntity.class, 16, Type.Byte, NewType.Discontinued), // unused on 1.8
+    PLAYER_ADDITIONAL_HEARTS(HumanEntity.class, 17, Type.Float, 10, NewType.Float),
+    PLAYER_SCORE(HumanEntity.class, 18, Type.Int, 11, NewType.VarInt),
+    PLAYER_HAND(HumanEntity.class, -1, Type.NonExistent, 5, NewType.Byte), // new in 1.9
+    SOMETHING_ANTICHEAT_PLUGINS_FOR_SOME_REASON_USE(HumanEntity.class, 11, Type.Byte, NewType.Discontinued), //For what we know, This doesn't exists. If you think it exists and knows what it does. Please tell us.
+    // horse
+    HORSE_INFO(Horse.class, 16, Type.Int, 12, NewType.Byte),
+    HORSE_TYPE(Horse.class, 19, Type.Byte, 13, NewType.VarInt),
+    HORSE_SUBTYPE(Horse.class, 20, Type.Int, 14, NewType.VarInt),
+    HORSE_OWNER(Horse.class, 21, Type.String, 15, NewType.OptUUID),
+    HORSE_ARMOR(Horse.class, 22, Type.Int, 16, NewType.VarInt),
+    // bat
+    BAT_ISHANGING(Bat.class, 16, Type.Byte, 11, NewType.Byte),
+    // tameable
+    TAMING_INFO(Tameable.class, 16, Type.Byte, 12, NewType.Byte),
+    TAMING_OWNER(Tameable.class, 17, Type.String, 13, NewType.OptUUID),
+    // ocelot
+    OCELOT_TYPE(Ocelot.class, 18, Type.Byte, 14, NewType.VarInt),
+    // wolf
+    WOLF_HEALTH(Wolf.class, 18, Type.Float, 14, NewType.Float),
+    WOLF_BEGGING(Wolf.class, 19, Type.Byte, 15, NewType.Boolean),
+    WOLF_COLLAR(Wolf.class, 20, Type.Byte, 16, NewType.VarInt),
+    // pig
+    PIG_SADDLE(Pig.class, 16, Type.Byte, 12, NewType.Boolean),
+    // rabbit
+    RABBIT_TYPE(Rabbit.class, 18, Type.Byte, 12, NewType.VarInt),
+    // sheep
+    SHEEP_COLOR(Sheep.class, 16, Type.Byte, 12, NewType.Byte),
+    // villager
+    VILLAGER_PROFESSION(Villager.class, 16, Type.Int, 12, NewType.VarInt),
+    // enderman
+    ENDERMAN_BLOCK(Enderman.class, 16, Type.Short, 11, NewType.BlockID), // special case
+    ENDERMAN_BLOCKDATA(Enderman.class, 17, Type.Byte, 11, NewType.BlockID), // special case
+    ENDERMAN_ISSCREAMING(Enderman.class, 18, Type.Byte, 12, NewType.Boolean),
+    // zombie
+    ZOMBIE_ISCHILD(Zombie.class, 12, Type.Byte, 11, NewType.Boolean),
+    ZOMBIE_ISVILLAGER(Zombie.class, 13, Type.Byte, 12, NewType.VarInt),
+    ZOMBIE_ISCONVERTING(Zombie.class, 14, Type.Byte, 13, NewType.Boolean),
+    // ZOMBIE_RISINGHANDS added in 1.9
+    // blaze
+    BLAZE_ONFIRE(Blaze.class, 16, Type.Byte, 11, NewType.Byte),
+    // spider
+    SPIDER_CIMBING(Spider.class, 16, Type.Byte, 11, NewType.Byte),
+    // creeper
+    CREEPER_FUSE(Creeper.class, 16, Type.Byte, 11, NewType.VarInt), // -1 idle, 1 is fuse
+    CREEPER_ISPOWERED(Creeper.class, 17, Type.Byte, 12, NewType.Boolean),
+    CREEPER_ISIGNITED(Creeper.class, 18, Type.Byte, 13, NewType.Boolean),
+    // ghast
+    GHAST_ISATTACKING(Ghast.class, 16, Type.Byte, 11, NewType.Boolean),
+    // slime
+    SLIME_SIZE(Slime.class, 16, Type.Byte, 11, NewType.VarInt),
+    // skeleton
+    SKELETON_TYPE(Skeleton.class, 13, Type.Byte, 11, NewType.VarInt),
+    // witch
+    WITCH_AGGRO(Witch.class, 21, Type.Byte, 11, NewType.Boolean),
+    // iron golem
+    IRON_PLAYERMADE(IronGolem.class, 16, Type.Byte, 11, NewType.Byte),
+    // wither
+    WITHER_TARGET1(Wither.class, 17, Type.Int, 11, NewType.VarInt),
+    WITHER_TARGET2(Wither.class, 18, Type.Int, 12, NewType.VarInt),
+    WITHER_TARGET3(Wither.class, 19, Type.Int, 13, NewType.VarInt),
+    WITHER_INVULN_TIME(Wither.class, 20, Type.Int, 14, NewType.VarInt),
+    WITHER_PROPERTIES(Wither.class, 10, Type.Byte, NewType.Byte),
+    WITHER_UNKNOWN(Wither.class, 11, Type.Byte, NewType.Discontinued),
+    // wither skull
+    WITHERSKULL_INVULN(WitherSkull.class, 10, Type.Byte, 5, NewType.Boolean),
+    // guardian
+    GUARDIAN_INFO(Guardian.class, 16, Type.Int, 11, NewType.Byte),
+    GUARDIAN_TARGET(Guardian.class, 17, Type.Int, 12, NewType.VarInt),
+    // boat
+    BOAT_SINCEHIT(Boat.class, 17, Type.Int, 5, NewType.VarInt),
+    BOAT_FORWARDDIR(Boat.class, 18, Type.Int, 6, NewType.VarInt),
+    BOAT_DMGTAKEN(Boat.class, 19, Type.Float, 7, NewType.Float),
+    // BOAT_TYPE in 1.9
+    // minecart
+    MINECART_SHAKINGPOWER(Minecart.class, 17, Type.Int, 5, NewType.VarInt),
+    MINECART_SHAKINGDIRECTION(Minecart.class, 18, Type.Int, 6, NewType.VarInt),
+    MINECART_DAMAGETAKEN(Minecart.class, 19, Type.Float, 7, NewType.Float), // also shaking modifier :P
+    MINECART_BLOCK(Minecart.class, 20, Type.Int, 8, NewType.VarInt),
+    MINECART_BLOCK_Y(Minecart.class, 21, Type.Int, 9, NewType.VarInt),
+    MINECART_SHOWBLOCK(Minecart.class, 22, Type.Byte, 10, NewType.Boolean),
+    // Command minecart (they are still broken)
+    MINECART_COMMANDBLOCK_COMMAND(Minecart.class, 23, Type.String, 11, NewType.String),
+    MINECART_COMMANDBLOCK_OUTPUT(Minecart.class, 24, Type.String, 12, NewType.Chat),
+    // furnace cart
+    FURNACECART_ISPOWERED(Minecart.class, 16, Type.Byte, 11, NewType.Boolean),
+    // item drop
+    ITEM_ITEM(Item.class, 10, Type.Slot, 5, NewType.Slot),
+    // arrow
+    ARROW_ISCRIT(Arrow.class, 16, Type.Byte, 5, NewType.Byte),
+    // firework
+    FIREWORK_INFO(Firework.class, 8, Type.Slot, 5, NewType.Slot),
+    // item frame
+    ITEMFRAME_ITEM(ItemFrame.class, 8, Type.Slot, 5, NewType.Slot),
+    ITEMFRAME_ROTATION(ItemFrame.class, 9, Type.Byte, 6, NewType.VarInt),
+    // ender crystal
+    ENDERCRYSTAL_HEALTH(EnderCrystal.class, 8, Type.Int, NewType.Discontinued),
+    // Ender dragon boss bar issues
+    ENDERDRAGON_UNKNOWN(EnderDragon.class, 5, Type.Byte, NewType.Discontinued),
+    ENDERDRAGON_NAME(EnderDragon.class, 10, Type.String, NewType.Discontinued),
+    // Normal Ender dragon
+    ENDERDRAGON_FLAG(EnderDragon.class, 15, Type.Byte, NewType.Discontinued),
+    ENDERDRAGON_PHASE(EnderDragon.class, 11, Type.Byte, NewType.VarInt);
+
+    private Class<?> clazz;
+    private int newIndex;
+    private NewType newType;
+    private Type oldType;
+    private int index;
+
+    MetaIndex(Class<?> type, int index, Type oldType, NewType newType) {
+        this.clazz = type;
+        this.index = index;
+        this.newIndex = index;
+        this.oldType = oldType;
+        this.newType = newType;
+    }
+
+    MetaIndex(Class<?> type, int index, Type oldType, int newIndex, NewType newType) {
+        this.clazz = type;
+        this.index = index;
+        this.oldType = oldType;
+        this.newIndex = newIndex;
+        this.newType = newType;
+    }
+
+    public static MetaIndex getIndex(EntityType type, int index) {
+        Class<? extends org.bukkit.entity.Entity> entityClass = type.getEntityClass();
+        if (entityClass == null) {
+            System.out.println("Could not get entity class for " + type);
+            return null;
+        }
+        for (MetaIndex mi : MetaIndex.values()) {
+            if (mi.getIndex() == index) {
+                // To fix issue with armour stands colliding with new values
+                if (mi.getApplicableClass().equals(LivingEntity.class)) continue;
+
+                if ((mi.getApplicableClass().isAssignableFrom(entityClass) ||
+                        mi.getApplicableClass().equals(entityClass))) {
+                    return mi;
+                }
+            }
+        }
+        // fall back to living entity
+        for (MetaIndex mi : MetaIndex.values()) {
+            if (mi.getIndex() == index) {
+                if (mi.getApplicableClass().isAssignableFrom(LivingEntity.class) ||
+                        mi.getApplicableClass().equals(LivingEntity.class)) {
+                    return mi;
+                }
+            }
+        }
+        return null;
+    }
+
+    public Class<?> getApplicableClass() {
+        return this.clazz;
+    }
+}
+

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataRewriter.java

@@ -0,0 +1,161 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.util.EulerAngle;
+import org.bukkit.util.Vector;
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class MetadataRewriter {
+    public static void transform(EntityType type, List<Metadata> list) {
+        short id = -1;
+        int data = -1;
+        for (Metadata entry : new ArrayList<>(list)) {
+            MetaIndex metaIndex = MetaIndex.getIndex(type, entry.getId());
+            try {
+                if (metaIndex != null) {
+                    if (metaIndex.getNewType() != NewType.Discontinued) {
+                        if (metaIndex.getNewType() != NewType.BlockID || id != -1 && data == -1 || id == -1 && data != -1) { // block ID is only written if we have both parts
+                            entry.setId(metaIndex.getNewIndex());
+                            entry.setTypeID(metaIndex.getNewType().getTypeID());
+                        }
+                        Object value = entry.getValue();
+                        switch (metaIndex.getNewType()) {
+                            case Byte:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.BYTE);
+                                // convert from int, byte
+                                if (metaIndex.getOldType() == Type.Byte) {
+                                    entry.setValue(value);
+                                }
+                                if (metaIndex.getOldType() == Type.Int) {
+                                    entry.setValue(((Integer) value).byteValue());
+                                }
+                                // After writing the last one
+                                if (metaIndex == MetaIndex.ENTITY_STATUS && type == EntityType.PLAYER) {
+                                    Byte val = 0;
+                                    if ((((Byte) value) & 0x10) == 0x10) { // Player eating/aiming/drinking
+                                        val = 1;
+                                    }
+                                    int newIndex = MetaIndex.PLAYER_HAND.getNewIndex();
+                                    int typeID = MetaIndex.PLAYER_HAND.getNewType().getTypeID();
+                                    Metadata metadata = new Metadata(newIndex, typeID, us.myles.ViaVersion.api.type.Type.BYTE, val);
+                                    list.add(metadata);
+                                }
+                                break;
+                            case OptUUID:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.OPTIONAL_UUID);
+                                String owner = (String) value;
+                                UUID toWrite = null;
+                                if (owner.length() != 0) {
+                                    try {
+                                        toWrite = UUID.fromString(owner);
+                                    } catch (Exception ignored) {
+                                    }
+                                }
+                                entry.setValue(toWrite);
+                                break;
+                            case BlockID:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.VAR_INT);
+                                // if we have both sources :))
+                                if (metaIndex.getOldType() == Type.Byte) {
+                                    data = (Byte) value;
+                                }
+                                if (metaIndex.getOldType() == Type.Short) {
+                                    id = (Short) value;
+                                }
+                                if (id != -1 && data != -1) {
+                                    int combined = id << 4 | data;
+                                    data = -1;
+                                    id = -1;
+                                    entry.setValue(combined);
+                                } else {
+                                    list.remove(entry);
+                                }
+                                break;
+                            case VarInt:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.VAR_INT);
+                                // convert from int, short, byte
+                                if (metaIndex.getOldType() == Type.Byte) {
+                                    entry.setValue(((Byte) value).intValue());
+                                }
+                                if (metaIndex.getOldType() == Type.Short) {
+                                    entry.setValue(((Short) value).intValue());
+                                }
+                                if (metaIndex.getOldType() == Type.Int) {
+                                    entry.setValue(value);
+                                }
+                                break;
+                            case Float:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.FLOAT);
+                                entry.setValue(value);
+                                break;
+                            case String:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.STRING);
+                                entry.setValue(value);
+                                break;
+                            case Boolean:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.BOOLEAN);
+                                if (metaIndex == MetaIndex.AGEABLE_AGE)
+                                    entry.setValue((Byte) value < 0);
+                                else
+                                    entry.setValue((Byte) value != 0);
+                                break;
+                            case Slot:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.ITEM);
+                                entry.setValue(value);
+                                ItemRewriter.toClient((Item) entry.getValue());
+                                break;
+                            case Position:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.VECTOR);
+                                Vector vector = (Vector) value;
+                                entry.setValue(vector);
+                                break;
+                            case Vector3F:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.ROTATION);
+                                EulerAngle angle = (EulerAngle) value;
+                                entry.setValue(angle);
+                                break;
+                            case Chat:
+                                entry.setType(us.myles.ViaVersion.api.type.Type.STRING);
+                                value = Protocol1_9TO1_8.fixJson((String) value);
+                                entry.setValue(value);
+                                break;
+                            default:
+                                System.out.println("[Out] Unhandled MetaDataType: " + metaIndex.getNewType());
+                                list.remove(entry);
+                                break;
+                        }
+                    } else {
+                        list.remove(entry);
+                    }
+                } else {
+                    throw new Exception("Could not find valid metadata");
+                }
+            } catch (Exception e) {
+                list.remove(entry);
+                if (!((ViaVersionPlugin) ViaVersion.getInstance()).isSuppressMetadataErrors()) {
+                    System.out.println("INCLUDE THIS IN YOUR ERROR LOG!");
+                    if (type != null)
+                        System.out.println("An error occurred with entity meta data for " + type + " OldID: " + entry.getId());
+                    else
+                        System.out.println("An error occurred with entity meta data for UNKNOWN_ENTITY OldID: " + entry.getId());
+                    if (metaIndex != null) {
+                        System.out.println("Value: " + entry.getValue());
+                        System.out.println("Old ID: " + metaIndex.getIndex() + " New ID: " + metaIndex.getNewIndex());
+                        System.out.println("Old Type: " + metaIndex.getOldType() + " New Type: " + metaIndex.getNewType());
+                    }
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataTypes.java

@@ -0,0 +1,26 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import us.myles.ViaVersion.api.type.Type;
+
+@RequiredArgsConstructor
+@Getter
+public enum MetadataTypes {
+    Byte(0, Type.BYTE),
+    Short(1, Type.SHORT),
+    Int(2, Type.INT),
+    Float(3, Type.FLOAT),
+    String(4, Type.STRING),
+    Slot(5, Type.ITEM),
+    Position(6, Type.VECTOR),
+    Rotation(7, Type.ROTATION),
+    NonExistent(-1, Type.NOTHING);
+
+    private final int typeID;
+    private final Type type;
+
+    public static MetadataTypes byId(int id) {
+        return values()[id];
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/NewType.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.metadata;
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/Type.java

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.metadata;
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

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

@@ -0,0 +1,297 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.packets;
+
+import org.bukkit.Material;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.protocol.Protocol;
+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.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.MetadataRewriter;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
+
+import java.util.List;
+
+public class EntityPackets {
+    public static ValueTransformer<Byte, Short> toNewShort = new ValueTransformer<Byte, Short>(Type.SHORT) {
+        @Override
+        public Short transform(PacketWrapper wrapper, Byte inputValue) {
+            return (short) (inputValue * 128);
+        }
+    };
+
+    public static void register(Protocol protocol) {
+        // Attach Entity Packet
+        protocol.registerOutgoing(State.PLAY, 0x1B, 0x3A, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Entity ID
+                map(Type.INT); // 1 - Vehicle
+
+                // Leash boolean is removed in new versions
+                map(Type.BOOLEAN, new ValueTransformer<Boolean, Void>(Type.NOTHING) {
+                    @Override
+                    public Void transform(PacketWrapper wrapper, Boolean inputValue) throws Exception {
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        if (!inputValue) {
+                            int passenger = wrapper.get(Type.INT, 0);
+                            int vehicle = wrapper.get(Type.INT, 1);
+
+                            wrapper.cancel(); // Don't send current packet
+
+                            PacketWrapper passengerPacket = wrapper.create(0x40); // Passenger Packet ID
+                            if (vehicle == -1) {
+                                if (!tracker.getVehicleMap().containsKey(passenger))
+                                    return null; // Cancel
+                                passengerPacket.write(Type.VAR_INT, tracker.getVehicleMap().remove(passenger));
+                                passengerPacket.write(Type.VAR_INT_ARRAY, new Integer[]{});
+                            } else {
+                                passengerPacket.write(Type.VAR_INT, vehicle);
+                                passengerPacket.write(Type.VAR_INT_ARRAY, new Integer[]{passenger});
+                                tracker.getVehicleMap().put(passenger, vehicle);
+                            }
+                            passengerPacket.send(); // Send the packet
+                        }
+                        return null;
+                    }
+                });
+            }
+        });
+        // Entity Teleport Packet
+        protocol.registerOutgoing(State.PLAY, 0x18, 0x4A, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.INT, SpawnPackets.toNewDouble); // 1 - X - Needs to be divide by 32
+                map(Type.INT, SpawnPackets.toNewDouble); // 2 - Y - Needs to be divide by 32
+                map(Type.INT, SpawnPackets.toNewDouble); // 3 - Z - Needs to be divide by 32
+
+                map(Type.BYTE); // 4 - Pitch
+                map(Type.BYTE); // 5 - Yaw
+
+                map(Type.BOOLEAN); // 6 - On Ground
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        if (ViaVersion.getConfig().isHologramPatch()) {
+                            EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                            if (tracker.getKnownHolograms().contains(entityID)) {
+                                Double newValue = wrapper.get(Type.DOUBLE, 1);
+                                newValue += (ViaVersion.getConfig().getHologramYOffset());
+                                wrapper.set(Type.DOUBLE, 1, newValue);
+                            }
+                        }
+                    }
+                });
+
+
+            }
+        });
+        // Entity Look Move Packet
+        protocol.registerOutgoing(State.PLAY, 0x17, 0x26, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.BYTE, toNewShort); // 1 - X
+                map(Type.BYTE, toNewShort); // 2 - Y
+                map(Type.BYTE, toNewShort); // 3 - Z
+
+                map(Type.BYTE); // 4 - Yaw
+                map(Type.BYTE); // 5 - Pitch
+
+                map(Type.BOOLEAN); // 6 - On Ground
+            }
+        });
+        // Entity Relative Move Packet
+        protocol.registerOutgoing(State.PLAY, 0x15, 0x25, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.BYTE, toNewShort); // 1 - X
+                map(Type.BYTE, toNewShort); // 2 - Y
+                map(Type.BYTE, toNewShort); // 3 - Z
+
+                map(Type.BOOLEAN); // 4 - On Ground
+            }
+        });
+        // Entity Equipment Packet
+        protocol.registerOutgoing(State.PLAY, 0x04, 0x3C, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                // 1 - Slot ID
+                map(Type.SHORT, new ValueTransformer<Short, Integer>(Type.VAR_INT) {
+                    @Override
+                    public Integer transform(PacketWrapper wrapper, Short slot) {
+                        return slot > 0 ? slot.intValue() + 1 : slot.intValue();
+                    }
+                });
+                map(Type.ITEM); // 2 - Item
+                // Item Rewriter
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        ItemRewriter.toClient(stack);
+                    }
+                });
+                // Blocking
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        Item stack = wrapper.get(Type.ITEM, 0);
+
+                        if (stack != null) {
+                            if(Material.getMaterial(stack.getId()) != null) {
+                                if (Material.getMaterial(stack.getId()).name().endsWith("SWORD")) {
+                                    entityTracker.getValidBlocking().add(entityID);
+                                    return;
+                                }
+                            }
+                        }
+                        entityTracker.getValidBlocking().remove(entityID);
+                    }
+                });
+            }
+        });
+        // Entity Metadata Packet
+        protocol.registerOutgoing(State.PLAY, 0x1C, 0x39, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Protocol1_9TO1_8.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);
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        if (tracker.getClientEntityTypes().containsKey(entityID)) {
+                            MetadataRewriter.transform(tracker.getClientEntityTypes().get(entityID), metadataList);
+                        } else if (!ViaVersion.getConfig().isUnknownEntitiesSuppressed()) {
+                            System.out.println("Unable to find entity for metadata, entity ID: " + entityID);
+                            metadataList.clear();
+                        }
+                    }
+                });
+
+                // Handler for meta data
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.handleMetadata(entityID, metadataList);
+                    }
+                });
+            }
+        });
+
+        // Entity Effect Packet
+        protocol.registerOutgoing(State.PLAY, 0x1D, 0x4C, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.BYTE); // 1 - Effect ID
+                map(Type.BYTE); // 2 - Amplifier
+                map(Type.VAR_INT); // 3 - Duration
+                handler(new PacketHandler() { //Handle effect indicator
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        boolean showParticles = wrapper.read(Type.BOOLEAN); //In 1.8 = true->Show particles : false->Hide particles
+                        boolean newEffect = ViaVersion.getConfig().isNewEffectIndicator();
+                        //0: hide, 1: shown without indictator, 2: shown with indicator, 3: hide with beacon indicator but we don't use it.
+                        wrapper.write(Type.BYTE, (byte) (showParticles ? newEffect ? 2 : 1 : 0));
+                    }
+                });
+            }
+        });
+
+        /* Packets which do not have any field remapping or handlers */
+
+        protocol.registerOutgoing(State.PLAY, 0x20, 0x4B); // Entity Properties Packet
+        protocol.registerOutgoing(State.PLAY, 0x1A, 0x1B); // Entity Status Packet
+        protocol.registerOutgoing(State.PLAY, 0x16, 0x27); // Entity Look Packet
+        protocol.registerOutgoing(State.PLAY, 0x14, 0x28); // Entity Packet
+
+        protocol.registerOutgoing(State.PLAY, 0x42, 0x2C); // Combat Event Packet
+        protocol.registerOutgoing(State.PLAY, 0x0A, 0x2F); // Use Bed Packet
+
+        protocol.registerOutgoing(State.PLAY, 0x1E, 0x31); // Remove Entity Effect Packet
+        protocol.registerOutgoing(State.PLAY, 0x19, 0x34); // Entity Head Look Packet
+        protocol.registerOutgoing(State.PLAY, 0x12, 0x3B); // Entity Velocity Packet
+
+        /* Incoming Packets */
+
+        // Entity Action Packet
+        protocol.registerIncoming(State.PLAY, 0x0B, 0x14, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Player ID
+                map(Type.VAR_INT); // 1 - Action
+                map(Type.VAR_INT); // 2 - Jump
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int action = wrapper.get(Type.VAR_INT, 1);
+                        if (action == 6 || action == 8)
+                            wrapper.cancel();
+                        if (action == 7) {
+                            wrapper.set(Type.VAR_INT, 1, 6);
+                        }
+                    }
+                });
+            }
+        });
+
+
+        // Use Entity Packet
+        protocol.registerIncoming(State.PLAY, 0x02, 0x0A, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID (Target)
+                map(Type.VAR_INT); // 1 - Action Type
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int type = wrapper.get(Type.VAR_INT, 1);
+                        if (type == 2) {
+                            wrapper.passthrough(Type.FLOAT); // 2 - X
+                            wrapper.passthrough(Type.FLOAT); // 3 - Y
+                            wrapper.passthrough(Type.FLOAT); // 4 - Z
+                        }
+                        if (type == 0 || type == 2) {
+                            wrapper.read(Type.VAR_INT); // 2/5 - Hand
+                        }
+                    }
+                });
+            }
+        });
+
+        /* Packets which do not have any field remapping or handlers */
+
+        protocol.registerIncoming(State.PLAY, 0x0C, 0x15); // Steer Vehicle Packet
+        protocol.registerIncoming(State.PLAY, 0x18, 0x1B); // Spectate Packet
+
+    }
+}

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

@@ -0,0 +1,340 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.packets;
+
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.remapper.ValueCreator;
+import us.myles.ViaVersion.api.type.Type;
+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;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.InventoryTracker;
+
+public class InventoryPackets {
+    public static void register(Protocol protocol) {
+        // Window Property Packet
+        protocol.registerOutgoing(State.PLAY, 0x31, 0x15, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                map(Type.SHORT); // 1 - Property Key
+                map(Type.SHORT); // 2 - Property Value
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        final short windowId = wrapper.get(Type.UNSIGNED_BYTE, 0);
+                        final short property = wrapper.get(Type.SHORT, 0);
+                        short value = wrapper.get(Type.SHORT, 1);
+                        InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
+                        if (inventoryTracker.getInventory() != null) {
+                            if (inventoryTracker.getInventory().equalsIgnoreCase("minecraft:enchanting_table")) {
+                                if (property > 3 && property < 7) {
+                                    // Send 2 properties, splitting it into enchantID & level
+                                    final short level = (short) (value >> 8);
+                                    final short enchantID = (short) (value & 0xFF);
+                                    wrapper.create(wrapper.getId(), new ValueCreator() {
+                                        @Override
+                                        public void write(PacketWrapper wrapper) throws Exception {
+                                            wrapper.write(Type.UNSIGNED_BYTE, windowId);
+                                            wrapper.write(Type.SHORT, property);
+                                            wrapper.write(Type.SHORT, enchantID);
+                                        }
+                                    }).send();
+
+                                    wrapper.set(Type.SHORT, 0, (short) (property + 3));
+                                    wrapper.set(Type.SHORT, 1, level);
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+        });
+        // Window Open Packet
+        protocol.registerOutgoing(State.PLAY, 0x2D, 0x13, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                map(Type.STRING); // 1 - Window Type
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 2 - Window Title
+                map(Type.UNSIGNED_BYTE); // 3 - Slot Count
+                // There is a horse parameter after this, we don't handle it and let it passthrough
+                // Inventory tracking
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        String inventory = wrapper.get(Type.STRING, 0);
+                        InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
+                        inventoryTracker.setInventory(inventory);
+                    }
+                });
+                // Brewing patch
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        String inventory = wrapper.get(Type.STRING, 0);
+                        if (inventory.equals("minecraft:brewing_stand")) {
+                            wrapper.set(Type.UNSIGNED_BYTE, 1, (short) (wrapper.get(Type.UNSIGNED_BYTE, 1) + 1));
+                        }
+                    }
+                });
+            }
+        });
+        // Window Set Slot Packet
+        protocol.registerOutgoing(State.PLAY, 0x2F, 0x16, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+
+                map(Type.BYTE); // 0 - Window ID
+                map(Type.SHORT); // 1 - Slot ID
+                map(Type.ITEM); // 2 - Slot Value
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        ItemRewriter.toClient(stack);
+                    }
+                });
+                // Brewing patch
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
+
+                        short slotID = wrapper.get(Type.SHORT, 0);
+                        if (inventoryTracker.getInventory() != null) {
+                            if (inventoryTracker.getInventory().equals("minecraft:brewing_stand")) {
+                                if (slotID >= 4) {
+                                    wrapper.set(Type.SHORT, 0, (short) (slotID + 1));
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+        });
+        // Window Set Slots Packet
+        protocol.registerOutgoing(State.PLAY, 0x30, 0x14, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                map(Type.ITEM_ARRAY); // 1 - Window Values
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item[] stacks = wrapper.get(Type.ITEM_ARRAY, 0);
+                        for (Item stack : stacks)
+                            ItemRewriter.toClient(stack);
+                    }
+                });
+                // Brewing Patch
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
+                        if (inventoryTracker.getInventory() != null) {
+                            if (inventoryTracker.getInventory().equals("minecraft:brewing_stand")) {
+                                Item[] oldStack = wrapper.get(Type.ITEM_ARRAY, 0);
+                                Item[] newStack = new Item[oldStack.length + 1];
+                                for (int i = 0; i < newStack.length; i++) {
+                                    if (i > 3) {
+                                        newStack[i] = oldStack[i - 1];
+                                    } else {
+                                        if (i != 3) { // Leave index 3 blank
+                                            newStack[i] = oldStack[i];
+                                        }
+                                    }
+                                }
+                                wrapper.set(Type.ITEM_ARRAY, 0, newStack);
+                            }
+                        }
+                    }
+                });
+            }
+        });
+        // Close Window Packet
+        protocol.registerOutgoing(State.PLAY, 0x2E, 0x12, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                // Inventory tracking
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
+                        inventoryTracker.setInventory(null);
+                    }
+                });
+            }
+        });
+
+        // Map Packet
+        protocol.registerOutgoing(State.PLAY, 0x34, 0x24, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Map ID
+                map(Type.BYTE); // 1 - Map Scale
+                create(new ValueCreator() {
+                    @Override
+                    public void write(PacketWrapper wrapper) {
+                        wrapper.write(Type.BOOLEAN, true); // 2 - Show marker
+                    }
+                });
+                // Everything else is passed through
+            }
+        });
+
+        /* Packets which do not have any field remapping or handlers */
+        protocol.registerOutgoing(State.PLAY, 0x09, 0x37); // Held Item Change Packet
+        protocol.registerOutgoing(State.PLAY, 0x32, 0x11); // Confirm Transaction Packet
+
+        /* Incoming Packets */
+
+        // Creative Inventory Slot Action Packet
+        protocol.registerIncoming(State.PLAY, 0x10, 0x18, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.SHORT); // 0 - Slot ID
+                map(Type.ITEM); // 1 - Item
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        ItemRewriter.toServer(stack);
+                    }
+                });
+                // Elytra throw patch
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        final short slot = wrapper.get(Type.SHORT, 0);
+                        boolean throwItem = (slot == 45);
+                        if (throwItem) {
+                            // Send a packet wiping the slot
+                            wrapper.create(0x16, new ValueCreator() {
+                                @Override
+                                public void write(PacketWrapper wrapper) throws Exception {
+                                    wrapper.write(Type.UNSIGNED_BYTE, (short) 0);
+                                    wrapper.write(Type.SHORT, slot);
+                                    wrapper.write(Type.SHORT, (short) -1);
+                                }
+                            }).send();
+                            // Finally reset to simulate throwing item
+                            wrapper.set(Type.SHORT, 0, (short) -999); // Set slot to -999
+                        }
+                    }
+                });
+            }
+        });
+
+        // Player Click Window Packet
+        protocol.registerIncoming(State.PLAY, 0x0E, 0x07, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Window ID
+                map(Type.SHORT); // 1 - Slot ID
+                map(Type.BYTE); // 2 - Button
+                map(Type.SHORT); // 3 - Action
+                map(Type.BYTE); // 4 - Mode
+                map(Type.ITEM); // 5 - Clicked Item
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item stack = wrapper.get(Type.ITEM, 0);
+                        ItemRewriter.toServer(stack);
+                    }
+                });
+                // Brewing patch and elytra throw patch
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        final short windowID = wrapper.get(Type.UNSIGNED_BYTE, 0);
+                        final short slot = wrapper.get(Type.SHORT, 0);
+                        boolean throwItem = (slot == 45 && windowID == 0);
+                        InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
+                        if (inventoryTracker.getInventory() != null) {
+                            if (inventoryTracker.getInventory().equals("minecraft:brewing_stand")) {
+                                if (slot == 4) {
+                                    throwItem = true;
+                                }
+                                if (slot > 4) {
+                                    wrapper.set(Type.SHORT, 0, (short) (slot - 1));
+                                }
+                            }
+                        }
+
+                        if (throwItem) {
+                            // Send a packet wiping the slot
+                            wrapper.create(0x16, new ValueCreator() {
+                                @Override
+                                public void write(PacketWrapper wrapper) throws Exception {
+                                    wrapper.write(Type.UNSIGNED_BYTE, windowID);
+                                    wrapper.write(Type.SHORT, slot);
+                                    wrapper.write(Type.SHORT, (short) -1);
+                                }
+                            }).send();
+                            // Finally reset to simulate throwing item
+                            wrapper.set(Type.BYTE, 0, (byte) 0); // Set button to 0
+                            wrapper.set(Type.BYTE, 1, (byte) 0); // Set mode to 0
+                            wrapper.set(Type.SHORT, 0, (short) -999); // Set slot to -999
+                        }
+                    }
+                });
+            }
+        });
+
+        // Close Window Incoming Packet
+        protocol.registerIncoming(State.PLAY, 0x0D, 0x08, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                // Inventory tracking
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
+                        inventoryTracker.setInventory(null);
+                    }
+                });
+            }
+        });
+
+        // Held Item Change Packet
+        protocol.registerIncoming(State.PLAY, 0x09, 0x17, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                // Blocking patch
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
+                        if (entityTracker.isBlocking()) {
+                            entityTracker.setBlocking(false);
+                            entityTracker.setSecondHand(null);
+                        }
+                    }
+                });
+            }
+        });
+
+        /* Packets which do not have any field remapping or handlers */
+
+        protocol.registerIncoming(State.PLAY, 0x0F, 0x05); // Confirm Transaction Packet
+        protocol.registerIncoming(State.PLAY, 0x11, 0x06); // Enchant Item Packet
+
+
+    }
+}

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

@@ -0,0 +1,444 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.packets;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.remapper.ValueCreator;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.PlayerMovementMapper;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
+
+public class PlayerPackets {
+    public static void register(Protocol protocol) {
+        // Chat Message Packet
+        protocol.registerOutgoing(State.PLAY, 0x02, 0x0F, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 0 - Chat Message (json)
+                map(Type.BYTE); // 1 - Chat Positon
+            }
+        });
+
+        // Header and Footer Packet
+        protocol.registerOutgoing(State.PLAY, 0x47, 0x48, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 0 - Header
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 1 - Footer
+            }
+        });
+
+        // Disconnect Packet
+        protocol.registerOutgoing(State.PLAY, 0x40, 0x1A, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 0 - Reason
+            }
+        });
+
+        // Title Packet
+        protocol.registerOutgoing(State.PLAY, 0x45, 0x45, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Action
+                // We only handle if the title or subtitle is set then just write through.
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int action = wrapper.get(Type.VAR_INT, 0);
+                        if (action == 0 || action == 1) {
+                            Protocol1_9TO1_8.FIX_JSON.write(wrapper, wrapper.read(Type.STRING));
+                        }
+                    }
+                });
+                // Everything else is handled.
+            }
+        });
+
+        // Player Position Packet
+        protocol.registerOutgoing(State.PLAY, 0x08, 0x2E, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.DOUBLE); // 0 - Player X
+                map(Type.DOUBLE); // 1 - Player Y
+                map(Type.DOUBLE); // 2 - Player Z
+
+                map(Type.FLOAT); // 3 - Player Yaw
+                map(Type.FLOAT); // 4 - Player Pitch
+
+                map(Type.BYTE); // 5 - Player Flags
+
+                create(new ValueCreator() {
+                    @Override
+                    public void write(PacketWrapper wrapper) {
+                        wrapper.write(Type.VAR_INT, 0); // 6 - Teleport ID was added
+                    }
+                });
+            }
+        });
+
+        // Team Packet
+        protocol.registerOutgoing(State.PLAY, 0x3E, 0x41, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Team Name
+                map(Type.BYTE); // 1 - Mode
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        byte mode = wrapper.get(Type.BYTE, 0); // Mode
+                        if (mode == 0 || mode == 2) {
+                            wrapper.passthrough(Type.STRING); // Display Name
+                            wrapper.passthrough(Type.STRING); // Prefix
+                            wrapper.passthrough(Type.STRING); // Suffix
+
+                            wrapper.passthrough(Type.BYTE); // Friendly Fire
+
+                            wrapper.passthrough(Type.STRING); // Name tag visibility
+
+                            wrapper.write(Type.STRING, ViaVersion.getConfig().isPreventCollision() ? "never" : "");
+
+                            wrapper.passthrough(Type.BYTE); // Colour
+                        }
+
+                        if (mode == 0 || mode == 3 || mode == 4) {
+                            String[] players = wrapper.read(Type.STRING_ARRAY); // Players
+                            final EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
+                            String myName = wrapper.user().get(ProtocolInfo.class).getUsername();
+                            for (String player : players) {
+                                if (entityTracker.isAutoTeam() && player.equalsIgnoreCase(myName)) {
+                                    if (mode == 4) {
+                                        // since removing add to auto team
+                                        ((ViaVersionPlugin) ViaVersion.getInstance()).run(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                entityTracker.sendTeamPacket(true);
+                                            }
+                                        }, false);
+                                    } else {
+                                        // since adding remove from auto team
+                                        entityTracker.sendTeamPacket(false);
+                                    }
+                                }
+                            }
+                            wrapper.write(Type.STRING_ARRAY, players);
+                        }
+                    }
+                });
+            }
+        });
+
+        // Join Game Packet
+        protocol.registerOutgoing(State.PLAY, 0x01, 0x23, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Player ID
+                // Parse this info
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception{
+                        int entityID = wrapper.get(Type.INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.getClientEntityTypes().put(entityID, EntityType.PLAYER);
+                    }
+                });
+                map(Type.UNSIGNED_BYTE); // 1 - Player Gamemode
+                map(Type.BYTE); // 2 - Player Dimension
+                map(Type.UNSIGNED_BYTE); // 3 - World Difficulty
+                map(Type.UNSIGNED_BYTE); // 4 - Max Players (Tab)
+                map(Type.STRING); // 5 - Level Type
+                map(Type.BOOLEAN); // 6 - Reduced Debug info
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int myID = wrapper.get(Type.INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.setEntityID(myID);
+                    }
+                });
+            }
+        });
+
+        // Player List Item Packet
+        protocol.registerOutgoing(State.PLAY, 0x38, 0x2D, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Action
+                map(Type.VAR_INT); // 1 - Player Count
+
+                // Due to this being a complex data structure we just use a handler.
+                handler(new PacketHandler() {
+
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int action = wrapper.get(Type.VAR_INT, 0);
+                        int count = wrapper.get(Type.VAR_INT, 1);
+                        for (int i = 0; i < count; i++) {
+                            wrapper.passthrough(Type.UUID); // Player UUID
+                            if (action == 0) { // add player
+                                wrapper.passthrough(Type.STRING); // Player Name
+
+                                int properties = wrapper.passthrough(Type.VAR_INT);
+
+                                // loop through properties
+                                for (int j = 0; j < properties; j++) {
+                                    wrapper.passthrough(Type.STRING); // name
+                                    wrapper.passthrough(Type.STRING); // value
+                                    boolean isSigned = wrapper.passthrough(Type.BOOLEAN);
+                                    if (isSigned) {
+                                        wrapper.passthrough(Type.STRING); // signature
+                                    }
+                                }
+
+                                wrapper.passthrough(Type.VAR_INT); // gamemode
+                                wrapper.passthrough(Type.VAR_INT); // ping
+                                boolean hasDisplayName = wrapper.passthrough(Type.BOOLEAN);
+                                if (hasDisplayName) {
+                                    Protocol1_9TO1_8.FIX_JSON.write(wrapper, wrapper.read(Type.STRING)); // display name
+                                }
+                            } else if ((action == 1) || (action == 2)) { // update gamemode || update latency
+                                wrapper.passthrough(Type.VAR_INT);
+                            } else if (action == 3) { // update display name
+                                boolean hasDisplayName = wrapper.passthrough(Type.BOOLEAN);
+                                if (hasDisplayName) {
+                                    Protocol1_9TO1_8.FIX_JSON.write(wrapper, wrapper.read(Type.STRING)); // display name
+                                }
+                            } else if (action == 4) { // remove player
+                                // no fields
+                            }
+                        }
+                    }
+                });
+            }
+        });
+        // Packet Plugin Message Outgoing
+        protocol.registerOutgoing(State.PLAY, 0x3F, 0x18, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Channel Name
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        String name = wrapper.get(Type.STRING, 0);
+                        if (name.equalsIgnoreCase("MC|BOpen")) {
+                            wrapper.passthrough(Type.REMAINING_BYTES); // This is so ugly, :(
+                            wrapper.write(Type.VAR_INT, 0);
+                        }
+                    }
+                });
+            }
+        });
+
+        /* Removed packets */
+
+        // Map Bulk
+        protocol.registerOutgoing(State.PLAY, 0x26, 0x26, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.cancel();
+                    }
+                });
+            }
+        });
+
+        // Update Entity NBT
+        protocol.registerOutgoing(State.PLAY, 0x49, 0x49, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.cancel();
+                    }
+                });
+            }
+        });
+
+        // Set Compression
+        protocol.registerOutgoing(State.PLAY, 0x46, 0x46, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.cancel();
+                    }
+                });
+            }
+        });
+
+        /* Packets which do not have any field remapping or handlers */
+
+        protocol.registerOutgoing(State.PLAY, 0x3A, 0x0E); // Tab Complete Response Packet
+        protocol.registerOutgoing(State.PLAY, 0x0B, 0x06); // Animation Packet
+        protocol.registerOutgoing(State.PLAY, 0x37, 0x07); // Stats Packet
+        protocol.registerOutgoing(State.PLAY, 0x36, 0x2A); // Open Sign Editor Packet
+        protocol.registerOutgoing(State.PLAY, 0x39, 0x2B); // Player Abilities Packet
+        protocol.registerOutgoing(State.PLAY, 0x00, 0x1F); // Keep Alive Packet
+        protocol.registerOutgoing(State.PLAY, 0x48, 0x32); // Resource Pack Send Packet
+        protocol.registerOutgoing(State.PLAY, 0x07, 0x33); // Respawn Packet
+        protocol.registerOutgoing(State.PLAY, 0x43, 0x36); // Camera Packet
+        protocol.registerOutgoing(State.PLAY, 0x2B, 0x1E); // Change Game State Packet
+
+        protocol.registerOutgoing(State.PLAY, 0x3D, 0x38); // Display Scoreboard Packet
+        protocol.registerOutgoing(State.PLAY, 0x3B, 0x3F); // Scoreboard Objective Packet
+        protocol.registerOutgoing(State.PLAY, 0x3C, 0x42); // Update Score Packet
+
+        protocol.registerOutgoing(State.PLAY, 0x05, 0x43); // Spawn Position Packet
+        protocol.registerOutgoing(State.PLAY, 0x1F, 0x3D); // Set XP Packet
+        protocol.registerOutgoing(State.PLAY, 0x06, 0x3E); // Update Health Packet
+        protocol.registerOutgoing(State.PLAY, 0x0D, 0x49); // Collect Item Packet
+
+        /* Incoming Packets */
+
+        // Tab Complete Request Packet
+        protocol.registerIncoming(State.PLAY, 0x14, 0x01, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Requested Command
+                map(Type.BOOLEAN, Type.NOTHING); // 1 - Is Command Block
+            }
+        });
+
+        // Client Settings Packet
+        protocol.registerIncoming(State.PLAY, 0x15, 0x04, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - locale
+                map(Type.BYTE); // 1 - View Distance
+                map(Type.VAR_INT, Type.BYTE); // 2 - Chat Mode
+                map(Type.BOOLEAN); // 3 - If Chat Colours on
+                map(Type.UNSIGNED_BYTE); // 4 - Skin Parts
+                map(Type.VAR_INT, Type.NOTHING); // 5 - Main Hand
+            }
+        });
+
+        // Animation Request Packet
+        protocol.registerIncoming(State.PLAY, 0x0A, 0x1A, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT, Type.NOTHING); // 0 - Hand
+            }
+        });
+
+        // TP Confirm
+        protocol.registerIncoming(State.PLAY, -1, 0x00, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.cancel();
+                    }
+                });
+            }
+        });
+
+        // Vehicle Move
+        protocol.registerIncoming(State.PLAY, -1, 0x10, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.cancel();
+                    }
+                });
+            }
+        });
+
+        // Steer Boat
+        protocol.registerIncoming(State.PLAY, -1, 0x11, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.cancel();
+                    }
+                });
+            }
+        });
+
+        // Packet Plugin Message Incoming
+        protocol.registerIncoming(State.PLAY, 0x17, 0x09, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Channel Name
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        String name = wrapper.get(Type.STRING, 0);
+                        if (name.equalsIgnoreCase("MC|BSign")) {
+                            Item item = wrapper.passthrough(Type.ITEM);
+                            if (item != null) {
+                                item.setId((short) Material.WRITTEN_BOOK.getId());
+                            }
+                        }
+                        if (name.equalsIgnoreCase("MC|AutoCmd")) {
+                            wrapper.set(Type.STRING, 0, "MC|AdvCdm");
+                            wrapper.write(Type.BYTE, (byte) 0);
+                            wrapper.passthrough(Type.INT); // X
+                            wrapper.passthrough(Type.INT); // Y
+                            wrapper.passthrough(Type.INT); // Z
+                            wrapper.passthrough(Type.STRING); // Command
+                            wrapper.passthrough(Type.BOOLEAN); // Flag
+                            wrapper.clearInputBuffer();
+                        }
+                        if (name.equalsIgnoreCase("MC|AdvCmd")) {
+                            wrapper.set(Type.STRING, 0, "MC|AdvCdm");
+                        }
+                    }
+                });
+            }
+        });
+
+        // Client Status Packet
+        protocol.registerIncoming(State.PLAY, 0x16, 0x03, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Action ID
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int action = wrapper.get(Type.VAR_INT, 0);
+                        if (action == 2) {
+                            // cancel any blocking >.>
+                            EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                            if (tracker.isBlocking()) {
+                                tracker.setSecondHand(null);
+                                tracker.setBlocking(false);
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+        /* Packets which do not have any field remapping or handlers */
+
+        protocol.registerIncoming(State.PLAY, 0x01, 0x02); // Chat Message Packet
+        protocol.registerIncoming(State.PLAY, 0x13, 0x12); // Player Abilities Request Packet
+        protocol.registerIncoming(State.PLAY, 0x19, 0x16); // Resource Pack Status Packet
+
+        protocol.registerIncoming(State.PLAY, 0x00, 0x0B); // Keep Alive Request Packet
+
+        protocol.registerIncoming(State.PLAY, 0x04, 0x0C, new PlayerMovementMapper()); // Player Position Packet
+        protocol.registerIncoming(State.PLAY, 0x06, 0x0D, new PlayerMovementMapper()); // Player Move & Look Packet
+        protocol.registerIncoming(State.PLAY, 0x05, 0x0E, new PlayerMovementMapper()); // Player Look Packet
+        protocol.registerIncoming(State.PLAY, 0x03, 0x0F, new PlayerMovementMapper()); // Player Packet
+    }
+}

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

@@ -0,0 +1,308 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.packets;
+
+import org.bukkit.entity.EntityType;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+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.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.MetadataRewriter;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
+import us.myles.ViaVersion.util.EntityUtil;
+
+import java.util.List;
+
+public class SpawnPackets {
+    public static ValueTransformer<Integer, Double> toNewDouble = new ValueTransformer<Integer, Double>(Type.DOUBLE) {
+        @Override
+        public Double transform(PacketWrapper wrapper, Integer inputValue) {
+            return inputValue / 32D;
+        }
+    };
+
+    public static void register(Protocol protocol) {
+        // Spawn Object Packet
+        protocol.registerOutgoing(State.PLAY, 0x0E, 0x00, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+
+                create(new ValueCreator() {
+                    @Override
+                    public void write(PacketWrapper wrapper) throws Exception {
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        wrapper.write(Type.UUID, tracker.getEntityUUID(entityID)); // 1 - UUID
+                    }
+                });
+                map(Type.BYTE); // 2 - Type
+
+                // Parse this info
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        int typeID = wrapper.get(Type.BYTE, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.getClientEntityTypes().put(entityID, EntityUtil.getTypeFromID(typeID, true));
+                    }
+                });
+
+                map(Type.INT, toNewDouble); // 3 - X - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 4 - Y - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 5 - Z - Needs to be divide by 32
+
+                map(Type.BYTE); // 6 - Pitch
+                map(Type.BYTE); // 7 - Yaw
+
+                map(Type.INT); // 8 - Data
+
+                // Create last 3 shorts
+                create(new ValueCreator() {
+                    @Override
+                    public void write(PacketWrapper wrapper) throws Exception {
+                        int data = wrapper.get(Type.INT, 0); // Data (1st Integer)
+
+                        short vX = 0, vY = 0, vZ = 0;
+                        if (data > 0) {
+                            vX = wrapper.read(Type.SHORT);
+                            vY = wrapper.read(Type.SHORT);
+                            vZ = wrapper.read(Type.SHORT);
+                        }
+
+                        wrapper.write(Type.SHORT, vX);
+                        wrapper.write(Type.SHORT, vY);
+                        wrapper.write(Type.SHORT, vZ);
+                    }
+                });
+            }
+        });
+
+        // Spawn XP Packet
+        protocol.registerOutgoing(State.PLAY, 0x11, 0x01, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+
+                // Parse this info
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.getClientEntityTypes().put(entityID, EntityType.EXPERIENCE_ORB);
+                    }
+                });
+
+                map(Type.INT, toNewDouble); // 1 - X - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 2 - Y - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 3 - Z - Needs to be divide by 32
+
+                map(Type.SHORT); // 4 - Amount to spawn
+            }
+        });
+
+        // Spawn Global Entity Packet
+        protocol.registerOutgoing(State.PLAY, 0x2C, 0x02, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.BYTE); // 1 - Type
+                // Parse this info
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        // Currently only lightning uses this
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.getClientEntityTypes().put(entityID, EntityType.LIGHTNING);
+                    }
+                });
+
+                map(Type.INT, toNewDouble); // 2 - X - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 3 - Y - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 4 - Z - Needs to be divide by 32
+            }
+        });
+
+        // Spawn Mob Packet
+        protocol.registerOutgoing(State.PLAY, 0x0F, 0x03, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+
+                create(new ValueCreator() {
+                    @Override
+                    public void write(PacketWrapper wrapper) throws Exception {
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        wrapper.write(Type.UUID, tracker.getEntityUUID(entityID)); // 1 - UUID
+                    }
+                });
+                map(Type.UNSIGNED_BYTE); // 2 - Type
+
+                // Parse this info
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        int typeID = wrapper.get(Type.UNSIGNED_BYTE, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.getClientEntityTypes().put(entityID, EntityUtil.getTypeFromID(typeID, false));
+                    }
+                });
+
+                map(Type.INT, toNewDouble); // 3 - X - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 4 - Y - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 5 - Z - Needs to be divide by 32
+
+                map(Type.BYTE); // 6 - Yaw
+                map(Type.BYTE); // 7 - Pitch
+                map(Type.BYTE); // 8 - Head Pitch
+
+                map(Type.SHORT); // 9 - Velocity X
+                map(Type.SHORT); // 10 - Velocity Y
+                map(Type.SHORT); // 11 - Velocity Z
+
+                map(Protocol1_9TO1_8.METADATA_LIST);
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        if (tracker.getClientEntityTypes().containsKey(entityID)) {
+                            MetadataRewriter.transform(tracker.getClientEntityTypes().get(entityID), metadataList);
+                        } else {
+                            System.out.println("Unable to find entity for metadata, entity ID: " + entityID);
+                            metadataList.clear();
+                        }
+                    }
+                });
+                // Handler for meta data
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.handleMetadata(entityID, metadataList);
+                    }
+                });
+            }
+        });
+
+        // Spawn Painting Packet
+        protocol.registerOutgoing(State.PLAY, 0x10, 0x04, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+
+                // Parse this info
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.getClientEntityTypes().put(entityID, EntityType.PAINTING);
+                    }
+                });
+
+
+                create(new ValueCreator() {
+                    @Override
+                    public void write(PacketWrapper wrapper) throws Exception {
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        wrapper.write(Type.UUID, tracker.getEntityUUID(entityID)); // 1 - UUID
+                    }
+                });
+
+                map(Type.STRING); // 2 - Title
+                map(Type.POSITION); // 3 - Position
+                map(Type.BYTE); // 4 - Direction
+            }
+        });
+
+        // Spawn Player Packet
+        protocol.registerOutgoing(State.PLAY, 0x0C, 0x05, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // 0 - Entity ID
+                map(Type.UUID); // 1 - Player UUID
+
+                // Parse this info
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.getClientEntityTypes().put(entityID, EntityType.PLAYER);
+                    }
+                });
+
+                map(Type.INT, toNewDouble); // 2 - X - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 3 - Y - Needs to be divide by 32
+                map(Type.INT, toNewDouble); // 4 - Z - Needs to be divide by 32
+
+                map(Type.BYTE); // 5 - Yaw
+                map(Type.BYTE); // 6 - Pitch
+
+                map(Type.SHORT, Type.NOTHING); // Current Item is discontinued
+
+                map(Protocol1_9TO1_8.METADATA_LIST);
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        if (tracker.getClientEntityTypes().containsKey(entityID)) {
+                            MetadataRewriter.transform(tracker.getClientEntityTypes().get(entityID), metadataList);
+                        } else {
+                            System.out.println("Unable to find entity for metadata, entity ID: " + entityID);
+                            metadataList.clear();
+                        }
+                    }
+                });
+
+                // Handler for meta data
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        List<Metadata> metadataList = wrapper.get(Protocol1_9TO1_8.METADATA_LIST, 0);
+                        int entityID = wrapper.get(Type.VAR_INT, 0);
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.handleMetadata(entityID, metadataList);
+                    }
+                });
+            }
+        });
+
+        // Entity Destroy Packet
+        protocol.registerOutgoing(State.PLAY, 0x13, 0x30, new PacketRemapper() {
+
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT_ARRAY); // 0 - Entities to destroy
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Integer[] entities = wrapper.get(Type.VAR_INT_ARRAY, 0);
+                        for (Integer entity : entities) {
+                            // EntityTracker
+                            wrapper.user().get(EntityTracker.class).removeEntity(entity);
+                        }
+                    }
+                });
+            }
+        });
+    }
+}

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

@@ -0,0 +1,400 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.packets;
+
+import org.bukkit.Material;
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
+import org.spacehq.opennbt.tag.builtin.StringTag;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.minecraft.Position;
+import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
+import us.myles.ViaVersion.api.minecraft.item.Item;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.remapper.ValueCreator;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.ArmorType;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds.SoundEffect;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.ClientChunks;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.ChunkType;
+
+public class WorldPackets {
+    public static void register(Protocol protocol) {
+        // Sign Update Packet
+        protocol.registerOutgoing(State.PLAY, 0x33, 0x46, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.POSITION); // 0 - Sign Position
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 1 - Sign Line (json)
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 2 - Sign Line (json)
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 3 - Sign Line (json)
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 4 - Sign Line (json)
+            }
+        });
+
+        // Play Effect Packet
+        protocol.registerOutgoing(State.PLAY, 0x28, 0x21, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.INT); // 0 - Effect ID
+                // Everything else get's written through
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int id = wrapper.get(Type.INT, 0);
+                        if (id >= 1000 && id < 2000 && id != 1005) { // Sound Effect
+                            wrapper.cancel();
+                        }
+                        if (id == 1005) { // Fix jukebox
+                            id = 1010;
+                        }
+                        wrapper.set(Type.INT, 0, id);
+                    }
+                });
+            }
+        });
+
+        // Play Named Sound Effect Packet
+        protocol.registerOutgoing(State.PLAY, 0x29, 0x19, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.STRING); // 0 - Sound Name
+                // 1 - Sound Category ID
+                // Everything else get's written through
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        String name = wrapper.get(Type.STRING, 0);
+
+                        SoundEffect effect = SoundEffect.getByName(name);
+                        int catid = 0;
+                        String newname = name;
+                        if (effect != null) {
+                            catid = effect.getCategory().getId();
+                            newname = effect.getNewName();
+                        }
+                        wrapper.set(Type.STRING, 0, newname);
+                        wrapper.write(Type.VAR_INT, catid); // Write Category ID
+                        if (effect != null && effect.isBreaksound()) {
+                            EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                            int x = wrapper.passthrough(Type.INT); //Position X
+                            int y = wrapper.passthrough(Type.INT); //Position Y
+                            int z = wrapper.passthrough(Type.INT); //Position Z
+                            if (tracker.interactedBlockRecently((int) Math.floor(x / 8.0), (int) Math.floor(y / 8.0), (int) Math.floor(z / 8.0))) {
+                                wrapper.cancel();
+                                return;
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+        // Chunk Packet
+        protocol.registerOutgoing(State.PLAY, 0x21, 0x20, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        ClientChunks clientChunks = wrapper.user().get(ClientChunks.class);
+                        Chunk chunk = wrapper.passthrough(new ChunkType(clientChunks));
+                        if (chunk.isUnloadPacket()) {
+                            PacketWrapper unload = wrapper.create(0x1D);
+                            unload.write(Type.INT, chunk.getX());
+                            unload.write(Type.INT, chunk.getZ());
+                            unload.send();
+                            wrapper.cancel();
+                        }
+                    }
+                });
+            }
+        });
+
+        // Update Block Entity Packet
+        protocol.registerOutgoing(State.PLAY, 0x35, 0x09, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.POSITION); // 0 - Block Position
+                map(Type.UNSIGNED_BYTE); // 1 - Action
+                map(Type.NBT); // 2 - NBT (Might not be present)
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int action = wrapper.get(Type.UNSIGNED_BYTE, 0);
+                        if (action == 1) { // Update Spawner
+                            CompoundTag tag = wrapper.get(Type.NBT, 0);
+                            if (tag != null) {
+                                if (tag.contains("EntityId")) {
+                                    String entity = (String) tag.get("EntityId").getValue();
+                                    CompoundTag spawn = new CompoundTag("SpawnData");
+                                    spawn.put(new StringTag("id", entity));
+                                    tag.put(spawn);
+                                } else { // EntityID does not exist
+                                    CompoundTag spawn = new CompoundTag("SpawnData");
+                                    spawn.put(new StringTag("id", "AreaEffectCloud")); //Make spawners show up as empty when no EntityId is given.
+                                    tag.put(spawn);
+                                }
+                            }
+                        }
+                        if (action == 2) { // Update Command Block
+                            // To prevent window issues don't send updates
+                            wrapper.cancel();
+                        }
+                    }
+                });
+            }
+        });
+
+        // Server Difficulty Packet
+        protocol.registerOutgoing(State.PLAY, 0x41, 0x0D, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        if (ViaVersion.getConfig().isAutoTeam()) {
+                            EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
+                            entityTracker.setAutoTeam(true);
+                            entityTracker.sendTeamPacket(true);
+                        }
+                    }
+                });
+            }
+        });
+        /* Packets which do not have any field remapping or handlers */
+
+        protocol.registerOutgoing(State.PLAY, 0x25, 0x08); // Block Break Animation Packet
+        protocol.registerOutgoing(State.PLAY, 0x24, 0x0A); // Block Action Packet
+        protocol.registerOutgoing(State.PLAY, 0x23, 0x0B); // Block Change Packet
+        protocol.registerOutgoing(State.PLAY, 0x22, 0x10); // Multi Block Change Packet
+        protocol.registerOutgoing(State.PLAY, 0x27, 0x1C); // Explosion Packet
+        protocol.registerOutgoing(State.PLAY, 0x2A, 0x22); // Particle Packet
+        protocol.registerOutgoing(State.PLAY, 0x03, 0x44); // Update Time Packet
+        protocol.registerOutgoing(State.PLAY, 0x44, 0x35); // World Border Packet
+
+        /* Incoming Packets */
+
+        // Sign Update Request Packet
+        protocol.registerIncoming(State.PLAY, 0x12, 0x19, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.POSITION); // 0 - Sign Position
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 1 - Sign Line (json)
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 2 - Sign Line (json)
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 3 - Sign Line (json)
+                map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 4 - Sign Line (json)
+            }
+        });
+
+        // Player Digging Packet
+        protocol.registerIncoming(State.PLAY, 0x07, 0x13, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); // 0 - Status
+                map(Type.POSITION); // 1 - Position
+                map(Type.UNSIGNED_BYTE); // 2 - Face
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int status = wrapper.get(Type.UNSIGNED_BYTE, 0);
+                        if (status == 6)
+                            wrapper.cancel();
+                    }
+                });
+                // Blocking
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int status = wrapper.get(Type.UNSIGNED_BYTE, 0);
+                        if (status == 5) {
+                            EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
+                            if (entityTracker.isBlocking()) {
+                                entityTracker.setBlocking(false);
+                                entityTracker.setSecondHand(null);
+                            }
+                        }
+                    }
+                });
+            }
+        });
+
+        // Use Item Packet
+        protocol.registerIncoming(State.PLAY, -1, 0x1D, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int hand = wrapper.read(Type.VAR_INT);
+                        // Wipe the input buffer
+                        wrapper.clearInputBuffer();
+                        // First set this packet ID to Block placement
+                        wrapper.setId(0x08);
+                        wrapper.write(Type.LONG, -1L);
+                        wrapper.write(Type.BYTE, (byte) 255);
+                        // Write item in hand
+                        Item item = Item.getItem(Protocol1_9TO1_8.getHandItem(wrapper.user()));
+                        // Blocking patch
+                        if (item != null) {
+                            if (Material.getMaterial(item.getId()) != null) {
+                                if (Material.getMaterial(item.getId()).name().endsWith("SWORD")) {
+                                    if (hand == 0) {
+                                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                                        if (!tracker.isBlocking()) {
+                                            tracker.setBlocking(true);
+                                            Item shield = new Item((short) 442, (byte) 1, (short) 0, null);
+                                            tracker.setSecondHand(shield);
+                                        }
+                                        wrapper.cancel();
+                                    }
+                                }
+                            }
+                        }
+                        wrapper.write(Type.ITEM, item);
+
+                        wrapper.write(Type.BYTE, (byte) 0);
+                        wrapper.write(Type.BYTE, (byte) 0);
+                        wrapper.write(Type.BYTE, (byte) 0);
+                    }
+                });
+                /*
+
+                The thing i've discovered is when using an item in air, it needs to send 2 packets.
+                I believe the issue is that this needs to be flipped with the packet above while still
+                sending block info.
+
+                Otherwise no idea, the disadvantage: Interact does not get fired if you right click
+                special items. (there's quite a few...)
+
+                 */
+//                handler(new PacketHandler() {
+//                    @Override
+//                    public void handle(PacketWrapper wrapper) throws Exception {
+//                        if(wrapper.isCancelled()) return;
+//                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+//                        if(tracker.isBlocking()) return;
+//
+//                        Long last = tracker.getLastPlaceBlock();
+//                        if (last != -1) {
+//                            if ((wrapper.user().getReceivedPackets() - last) < 3) {
+//                                tracker.setLastPlaceBlock(-1L);
+//                                return;
+//                            }
+//                            tracker.setLastPlaceBlock(-1L);
+//                        }
+//                        final Item item = wrapper.get(Type.ITEM, 0);
+//                        wrapper.create(0x08, new ValueCreator() {
+//                            @Override
+//                            public void write(PacketWrapper wrapper) throws Exception {
+//                                wrapper.write(Type.POSITION, new Position(1L, 1L, 1L));
+//                                wrapper.write(Type.BYTE, (byte) 2);
+//                                wrapper.write(Type.ITEM, item); // hand
+//
+//                                wrapper.write(Type.UNSIGNED_BYTE, (short) 1);
+//                                wrapper.write(Type.UNSIGNED_BYTE, (short) 1);
+//                                wrapper.write(Type.UNSIGNED_BYTE, (short) 1);
+//                            }
+//                        }).sendToServer();
+//                    }
+//                });
+
+            }
+        });
+
+        // Block Placement Packet
+        protocol.registerIncoming(State.PLAY, 0x08, 0x1C, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.POSITION); // 0 - Position
+                map(Type.VAR_INT, Type.BYTE); // 1 - Block Face
+                map(Type.VAR_INT, Type.NOTHING); // 2 - Hand
+                create(new ValueCreator() {
+                    @Override
+                    public void write(PacketWrapper wrapper) throws Exception {
+                        Item item = Item.getItem(Protocol1_9TO1_8.getHandItem(wrapper.user()));
+                        wrapper.write(Type.ITEM, item); // 3 - Item
+                    }
+                });
+                map(Type.UNSIGNED_BYTE); // 4 - X
+                map(Type.UNSIGNED_BYTE); // 5 - Y
+                map(Type.UNSIGNED_BYTE); // 6 - Z
+
+                // Cancel if item as 1.9 uses Use_Item packet
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        Item item = wrapper.get(Type.ITEM, 0);
+                        if (item != null) {
+                            Material m = Material.getMaterial(item.getId());
+                            if (m != null) {
+                                // Prevent special items from sending certain info
+                                // Books
+                                boolean special = m == Material.WRITTEN_BOOK;
+                                // Buckets
+                                special = special || m == Material.WATER_BUCKET || m == Material.LAVA_BUCKET || m == Material.BUCKET;
+                                // Food
+                                special = special || m.isEdible();
+                                // Potions
+                                special = special || m == Material.POTION || m == Material.GLASS_BOTTLE;
+                                // Projectiles
+                                special = special || m == Material.BOW;
+                                special = special || m == Material.SNOW_BALL || m == Material.EGG || m == Material.EXP_BOTTLE || m == Material.ENDER_PEARL || m == Material.EYE_OF_ENDER;
+                                // Armour
+                                special = special || ArmorType.isArmor(m);
+                                // Don't send data if special
+                                if (special && m != Material.AIR) {
+                                    EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                                    tracker.setLastPlaceBlock(wrapper.user().getReceivedPackets());
+                                }
+
+                            }
+                        }
+                    }
+                });
+
+                //Register block place to fix sounds
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        int face = wrapper.get(Type.BYTE, 0);
+                        if (face == 255)
+                            return;
+                        Position p = wrapper.get(Type.POSITION, 0);
+                        long x = p.getX();
+                        long y = p.getY();
+                        long z = p.getZ();
+                        switch (face) {
+                            case 0:
+                                y--;
+                                break;
+                            case 1:
+                                y++;
+                                break;
+                            case 2:
+                                z--;
+                                break;
+                            case 3:
+                                z++;
+                                break;
+                            case 4:
+                                x--;
+                                break;
+                            case 5:
+                                x++;
+                                break;
+                        }
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.addBlockInteraction(new Position(x, y, z));
+                    }
+                });
+
+            }
+        });
+    }
+}

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

@@ -1,4 +1,4 @@
-package us.myles.ViaVersion.sounds;
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

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

@@ -1,283 +1,291 @@
-package us.myles.ViaVersion.sounds;
-
-import lombok.Getter;
-
-@Getter
-public enum SoundEffect {
-
-    MOB_HORSE_ZOMBIE_IDLE("mob.horse.zombie.idle", "entity.zombie_horse.ambient", SoundCategory.NEUTRAL),
-    NOTE_SNARE("note.snare", "block.note.snare", SoundCategory.RECORD),
-    RANDOM_WOOD_CLICK("random.wood_click", "block.wood_button.click_on", SoundCategory.BLOCK),
-    DIG_GRAVEL("dig.gravel", "block.gravel.place", SoundCategory.BLOCK),
-    RANDOM_BOWHIT("random.bowhit", "block.tripwire.detach", SoundCategory.NEUTRAL),
-    DIG_GLASS("dig.glass", "block.glass.break", SoundCategory.BLOCK),
-    MOB_ZOMBIE_SAY("mob.zombie.say", "entity.zombie_villager.ambient", SoundCategory.HOSTILE),
-    MOB_PIG_DEATH("mob.pig.death", "entity.pig.death", SoundCategory.NEUTRAL),
-    MOB_HORSE_DONKEY_HIT("mob.horse.donkey.hit", "entity.donkey.hurt", SoundCategory.NEUTRAL),
-    GAME_NEUTRAL_SWIM("game.neutral.swim", "entity.player.swim", SoundCategory.NEUTRAL),
-    GAME_PLAYER_SWIM("game.player.swim", "entity.player.swim", SoundCategory.PLAYER),
-    MOB_ENDERMEN_IDLE("mob.endermen.idle", "entity.endermen.ambient", SoundCategory.HOSTILE),
-    PORTAL_PORTAL("portal.portal", "block.portal.ambient", SoundCategory.BLOCK),
-    RANDOM_FIZZ("random.fizz", "entity.generic.extinguish_fire", SoundCategory.BLOCK),
-    NOTE_HARP("note.harp", "block.note.harp", SoundCategory.RECORD),
-    STEP_SNOW("step.snow", "block.snow.step", SoundCategory.NEUTRAL),
-    RANDOM_SUCCESSFUL_HIT("random.successful_hit", "entity.arrow.hit_player", SoundCategory.PLAYER),
-    MOB_ZOMBIEPIG_ZPIGHURT("mob.zombiepig.zpighurt", "entity.zombie_pig.hurt", SoundCategory.HOSTILE),
-    MOB_WOLF_HOWL("mob.wolf.howl", "entity.wolf.howl", SoundCategory.NEUTRAL),
-    FIREWORKS_LAUNCH("fireworks.launch", "entity.firework.launch", SoundCategory.AMBIENT),
-    MOB_COW_HURT("mob.cow.hurt", "entity.cow.death", SoundCategory.NEUTRAL),
-    FIREWORKS_LARGEBLAST("fireworks.largeBlast", "entity.firework.large_blast", SoundCategory.AMBIENT),
-    MOB_BLAZE_HIT("mob.blaze.hit", "entity.blaze.hurt", SoundCategory.HOSTILE),
-    MOB_VILLAGER_DEATH("mob.villager.death", "entity.villager.death", SoundCategory.NEUTRAL),
-    MOB_BLAZE_DEATH("mob.blaze.death", "entity.blaze.death", SoundCategory.HOSTILE),
-    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),
-    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),
-    MOB_SLIME_SMALL("mob.slime.small", "block.slime.hit", SoundCategory.HOSTILE),
-    MOB_GHAST_DEATH("mob.ghast.death", "entity.ghast.death", SoundCategory.HOSTILE),
-    MOB_GUARDIAN_ATTACK("mob.guardian.attack", "entity.guardian.attack", SoundCategory.HOSTILE),
-    RANDOM_CLICK("random.click", "block.wood_pressureplate.click_on", SoundCategory.BLOCK),
-    MOB_ZOMBIEPIG_ZPIG("mob.zombiepig.zpig", "entity.zombie_pig.ambient", SoundCategory.HOSTILE),
-    GAME_PLAYER_DIE("game.player.die", "entity.player.death", SoundCategory.PLAYER),
-    FIREWORKS_TWINKLE_FAR("fireworks.twinkle_far", "entity.firework.twinkle_far", SoundCategory.AMBIENT),
-    MOB_GUARDIAN_LAND_IDLE("mob.guardian.land.idle", "entity.guardian.ambient_land", SoundCategory.HOSTILE),
-    DIG_GRASS("dig.grass", "block.grass.place", SoundCategory.BLOCK),
-    MOB_SKELETON_STEP("mob.skeleton.step", "entity.skeleton.step", SoundCategory.HOSTILE),
-    MOB_WITHER_DEATH("mob.wither.death", "entity.wither.death", SoundCategory.HOSTILE),
-    MOB_WOLF_HURT("mob.wolf.hurt", "entity.wolf.hurt", SoundCategory.NEUTRAL),
-    MOB_HORSE_LEATHER("mob.horse.leather", "entity.horse.saddle", SoundCategory.NEUTRAL),
-    MOB_BAT_LOOP("mob.bat.loop", "entity.bat.loop", SoundCategory.NEUTRAL),
-    MOB_GHAST_SCREAM("mob.ghast.scream", "entity.ghast.hurt", SoundCategory.HOSTILE),
-    GAME_PLAYER_HURT("game.player.hurt", "entity.player.death", SoundCategory.PLAYER),
-    GAME_NEUTRAL_DIE("game.neutral.die", "entity.player.death", SoundCategory.NEUTRAL),
-    MOB_CREEPER_DEATH("mob.creeper.death", "entity.creeper.death", SoundCategory.HOSTILE),
-    MOB_HORSE_GALLOP("mob.horse.gallop", "entity.horse.gallop", SoundCategory.NEUTRAL),
-    MOB_WITHER_SPAWN("mob.wither.spawn", "entity.wither.spawn", SoundCategory.HOSTILE),
-    MOB_ENDERMEN_HIT("mob.endermen.hit", "entity.endermen.hurt", SoundCategory.HOSTILE),
-    MOB_CREEPER_SAY("mob.creeper.say", "entity.creeper.hurt", SoundCategory.HOSTILE),
-    MOB_HORSE_WOOD("mob.horse.wood", "entity.horse.step_wood", SoundCategory.NEUTRAL),
-    MOB_ZOMBIE_UNFECT("mob.zombie.unfect", "entity.zombie_villager.converted", SoundCategory.HOSTILE),
-    RANDOM_ANVIL_USE("random.anvil_use", "block.anvil.use", SoundCategory.BLOCK),
-    RANDOM_CHESTCLOSED("random.chestclosed", "block.enderchest.close", SoundCategory.BLOCK),
-    MOB_SHEEP_SHEAR("mob.sheep.shear", "entity.sheep.shear", SoundCategory.NEUTRAL),
-    RANDOM_POP("random.pop", "entity.item.pickup", SoundCategory.PLAYER),
-    MOB_BAT_DEATH("mob.bat.death", "entity.bat.death", SoundCategory.NEUTRAL),
-    DIG_WOOD("dig.wood", "block.ladder.break", SoundCategory.BLOCK),
-    MOB_HORSE_DONKEY_DEATH("mob.horse.donkey.death", "entity.donkey.death", SoundCategory.NEUTRAL),
-    FIREWORKS_BLAST("fireworks.blast", "entity.firework.blast", SoundCategory.AMBIENT),
-    MOB_ZOMBIEPIG_ZPIGANGRY("mob.zombiepig.zpigangry", "entity.zombie_pig.angry", SoundCategory.HOSTILE),
-    GAME_HOSTILE_SWIM("game.hostile.swim", "entity.player.swim", SoundCategory.HOSTILE),
-    MOB_GUARDIAN_FLOP("mob.guardian.flop", "entity.guardian.flop", SoundCategory.HOSTILE),
-    MOB_VILLAGER_YES("mob.villager.yes", "entity.villager.yes", SoundCategory.NEUTRAL),
-    MOB_GHAST_CHARGE("mob.ghast.charge", "entity.ghast.warn", SoundCategory.HOSTILE),
-    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),
-    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),
-    AMBIENT_WEATHER_RAIN("ambient.weather.rain", "weather.rain.above", SoundCategory.WEATHER),
-    PORTAL_TRIGGER("portal.trigger", "block.portal.trigger", SoundCategory.BLOCK),
-    RANDOM_CHESTOPEN("random.chestopen", "block.enderchest.open", SoundCategory.BLOCK),
-    MOB_HORSE_LAND("mob.horse.land", "entity.horse.land", SoundCategory.NEUTRAL),
-    MOB_SILVERFISH_STEP("mob.silverfish.step", "entity.silverfish.step", SoundCategory.HOSTILE),
-    MOB_BAT_TAKEOFF("mob.bat.takeoff", "entity.bat.takeoff", SoundCategory.NEUTRAL),
-    MOB_VILLAGER_NO("mob.villager.no", "entity.villager.no", SoundCategory.NEUTRAL),
-    GAME_HOSTILE_HURT_FALL_BIG("game.hostile.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.HOSTILE),
-    MOB_IRONGOLEM_WALK("mob.irongolem.walk", "entity.irongolem.step", SoundCategory.NEUTRAL),
-    NOTE_HAT("note.hat", "block.note.hat", SoundCategory.RECORD),
-    MOB_ZOMBIE_METAL("mob.zombie.metal", "entity.zombie.attack_iron_door", SoundCategory.HOSTILE),
-    MOB_VILLAGER_HAGGLE("mob.villager.haggle", "entity.villager.trading", SoundCategory.NEUTRAL),
-    MOB_GHAST_FIREBALL("mob.ghast.fireball", "entity.blaze.shoot", SoundCategory.HOSTILE),
-    MOB_IRONGOLEM_DEATH("mob.irongolem.death", "entity.irongolem.death", SoundCategory.NEUTRAL),
-    RANDOM_BREAK("random.break", "item.shield.break", SoundCategory.PLAYER),
-    MOB_ZOMBIE_REMEDY("mob.zombie.remedy", "entity.zombie_villager.cure", SoundCategory.HOSTILE),
-    RANDOM_BOW("random.bow", "entity.splash_potion.throw", SoundCategory.NEUTRAL),
-    MOB_VILLAGER_IDLE("mob.villager.idle", "entity.villager.ambient", SoundCategory.NEUTRAL),
-    STEP_CLOTH("step.cloth", "block.cloth.fall", SoundCategory.NEUTRAL),
-    MOB_SILVERFISH_HIT("mob.silverfish.hit", "entity.endermite.hurt", SoundCategory.HOSTILE),
-    LIQUID_LAVA("liquid.lava", "block.lava.ambient", SoundCategory.BLOCK),
-    GAME_NEUTRAL_HURT_FALL_BIG("game.neutral.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.NEUTRAL),
-    FIRE_FIRE("fire.fire", "block.fire.ambient", SoundCategory.BLOCK),
-    MOB_ZOMBIE_WOOD("mob.zombie.wood", "entity.zombie.attack_door_wood", SoundCategory.HOSTILE),
-    MOB_CHICKEN_STEP("mob.chicken.step", "entity.chicken.step", SoundCategory.NEUTRAL),
-    MOB_GUARDIAN_LAND_HIT("mob.guardian.land.hit", "entity.guardian.hurt_land", SoundCategory.HOSTILE),
-    MOB_CHICKEN_PLOP("mob.chicken.plop", "entity.donkey.chest", SoundCategory.NEUTRAL),
-    MOB_ENDERDRAGON_WINGS("mob.enderdragon.wings", "entity.enderdragon.flap", SoundCategory.HOSTILE),
-    STEP_GRASS("step.grass", "block.grass.hit", SoundCategory.NEUTRAL),
-    MOB_HORSE_BREATHE("mob.horse.breathe", "entity.horse.breathe", SoundCategory.NEUTRAL),
-    GAME_PLAYER_HURT_FALL_BIG("game.player.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.PLAYER),
-    MOB_HORSE_DONKEY_IDLE("mob.horse.donkey.idle", "entity.donkey.ambient", SoundCategory.NEUTRAL),
-    MOB_SPIDER_STEP("mob.spider.step", "entity.spider.step", SoundCategory.HOSTILE),
-    GAME_NEUTRAL_HURT("game.neutral.hurt", "entity.player.death", SoundCategory.NEUTRAL),
-    MOB_COW_SAY("mob.cow.say", "entity.cow.ambient", SoundCategory.NEUTRAL),
-    MOB_HORSE_JUMP("mob.horse.jump", "entity.horse.jump", SoundCategory.NEUTRAL),
-    MOB_HORSE_SOFT("mob.horse.soft", "entity.horse.step", SoundCategory.NEUTRAL),
-    GAME_NEUTRAL_SWIM_SPLASH("game.neutral.swim.splash", "entity.generic.splash", SoundCategory.NEUTRAL),
-    MOB_GUARDIAN_HIT("mob.guardian.hit", "entity.guardian.hurt", SoundCategory.HOSTILE),
-    MOB_ENDERDRAGON_END("mob.enderdragon.end", "entity.enderdragon.death", SoundCategory.HOSTILE),
-    MOB_ZOMBIE_STEP("mob.zombie.step", "entity.zombie.step", SoundCategory.HOSTILE),
-    MOB_ENDERDRAGON_GROWL("mob.enderdragon.growl", "entity.enderdragon.growl", SoundCategory.HOSTILE),
-    MOB_WOLF_SHAKE("mob.wolf.shake", "entity.wolf.shake", SoundCategory.NEUTRAL),
-    MOB_ENDERMEN_DEATH("mob.endermen.death", "entity.endermen.death", SoundCategory.HOSTILE),
-    RANDOM_ANVIL_LAND("random.anvil_land", "block.anvil.land", SoundCategory.BLOCK),
-    GAME_HOSTILE_HURT("game.hostile.hurt", "entity.player.death", SoundCategory.HOSTILE),
-    MINECART_INSIDE("minecart.inside", "entity.minecart.inside", SoundCategory.PLAYER),
-    MOB_SLIME_BIG("mob.slime.big", "entity.slime.death", SoundCategory.HOSTILE),
-    LIQUID_WATER("liquid.water", "block.water.ambient", SoundCategory.BLOCK),
-    MOB_PIG_SAY("mob.pig.say", "entity.pig.ambient", SoundCategory.NEUTRAL),
-    MOB_WITHER_SHOOT("mob.wither.shoot", "entity.wither.shoot", SoundCategory.HOSTILE),
-    ITEM_FIRECHARGE_USE("item.fireCharge.use", "entity.blaze.shoot", SoundCategory.BLOCK),
-    STEP_SAND("step.sand", "block.sand.fall", SoundCategory.NEUTRAL),
-    MOB_IRONGOLEM_HIT("mob.irongolem.hit", "entity.irongolem.hurt", SoundCategory.NEUTRAL),
-    MOB_HORSE_DEATH("mob.horse.death", "entity.horse.death", SoundCategory.NEUTRAL),
-    MOB_BAT_HURT("mob.bat.hurt", "entity.bat.hurt", SoundCategory.NEUTRAL),
-    MOB_GHAST_AFFECTIONATE_SCREAM("mob.ghast.affectionate_scream", "entity.ghast.scream", SoundCategory.HOSTILE),
-    MOB_GUARDIAN_ELDER_IDLE("mob.guardian.elder.idle", "entity.elder_guardian.ambient", SoundCategory.HOSTILE),
-    MOB_ZOMBIEPIG_ZPIGDEATH("mob.zombiepig.zpigdeath", "entity.zombie_pig.death", SoundCategory.HOSTILE),
-    AMBIENT_WEATHER_THUNDER("ambient.weather.thunder", "entity.lightning.thunder", SoundCategory.WEATHER),
-    MINECART_BASE("minecart.base", "entity.minecart.riding", SoundCategory.NEUTRAL),
-    STEP_LADDER("step.ladder", "block.ladder.hit", SoundCategory.NEUTRAL),
-    MOB_HORSE_DONKEY_ANGRY("mob.horse.donkey.angry", "entity.donkey.angry", SoundCategory.NEUTRAL),
-    AMBIENT_CAVE_CAVE("ambient.cave.cave", "ambient.cave", SoundCategory.AMBIENT),
-    FIREWORKS_BLAST_FAR("fireworks.blast_far", "entity.firework.blast_far", SoundCategory.AMBIENT),
-    GAME_NEUTRAL_HURT_FALL_SMALL("game.neutral.hurt.fall.small", "entity.generic.small_fall", SoundCategory.NEUTRAL),
-    GAME_HOSTILE_SWIM_SPLASH("game.hostile.swim.splash", "entity.generic.splash", SoundCategory.HOSTILE),
-    RANDOM_DRINK("random.drink", "entity.generic.drink", SoundCategory.PLAYER),
-    GAME_HOSTILE_DIE("game.hostile.die", "entity.player.death", SoundCategory.HOSTILE),
-    MOB_CAT_HISS("mob.cat.hiss", "entity.cat.hiss", SoundCategory.NEUTRAL),
-    NOTE_BD("note.bd", "block.note.basedrum", SoundCategory.RECORD),
-    MOB_SPIDER_SAY("mob.spider.say", "entity.spider.hurt", SoundCategory.HOSTILE),
-    STEP_STONE("step.stone", "block.anvil.hit", SoundCategory.NEUTRAL),
-    RANDOM_LEVELUP("random.levelup", "entity.player.levelup", SoundCategory.PLAYER),
-    LIQUID_LAVAPOP("liquid.lavapop", "block.lava.pop", SoundCategory.BLOCK),
-    MOB_SHEEP_SAY("mob.sheep.say", "entity.sheep.ambient", SoundCategory.NEUTRAL),
-    MOB_SKELETON_SAY("mob.skeleton.say", "entity.skeleton.ambient", SoundCategory.HOSTILE),
-    MOB_BLAZE_BREATHE("mob.blaze.breathe", "entity.blaze.ambient", SoundCategory.HOSTILE),
-    MOB_BAT_IDLE("mob.bat.idle", "entity.bat.ambient", SoundCategory.NEUTRAL),
-    MOB_MAGMACUBE_BIG("mob.magmacube.big", "entity.magmacube.squish", SoundCategory.HOSTILE),
-    MOB_HORSE_IDLE("mob.horse.idle", "entity.horse.ambient", SoundCategory.NEUTRAL),
-    GAME_HOSTILE_HURT_FALL_SMALL("game.hostile.hurt.fall.small", "entity.generic.small_fall", SoundCategory.HOSTILE),
-    MOB_HORSE_ZOMBIE_HIT("mob.horse.zombie.hit", "entity.zombie_horse.hurt", SoundCategory.NEUTRAL),
-    MOB_IRONGOLEM_THROW("mob.irongolem.throw", "entity.irongolem.attack", SoundCategory.NEUTRAL),
-    DIG_CLOTH("dig.cloth", "block.cloth.place", SoundCategory.BLOCK),
-    STEP_GRAVEL("step.gravel", "block.gravel.hit", SoundCategory.NEUTRAL),
-    MOB_SILVERFISH_SAY("mob.silverfish.say", "entity.silverfish.ambient", SoundCategory.HOSTILE),
-    MOB_CAT_PURR("mob.cat.purr", "entity.cat.purr", SoundCategory.NEUTRAL),
-    MOB_ZOMBIE_INFECT("mob.zombie.infect", "entity.zombie.infect", SoundCategory.HOSTILE),
-    RANDOM_EAT("random.eat", "entity.generic.eat", SoundCategory.PLAYER),
-    MOB_WOLF_BARK("mob.wolf.bark", "entity.wolf.ambient", SoundCategory.NEUTRAL),
-    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),
-    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),
-    DIG_SNOW("dig.snow", "block.snow.place", SoundCategory.BLOCK),
-    TILE_PISTON_OUT("tile.piston.out", "block.piston.extend", SoundCategory.BLOCK),
-    RANDOM_BURP("random.burp", "entity.player.burp", SoundCategory.PLAYER),
-    MOB_COW_STEP("mob.cow.step", "entity.cow.step", SoundCategory.NEUTRAL),
-    MOB_WITHER_HURT("mob.wither.hurt", "entity.wither.hurt", SoundCategory.HOSTILE),
-    MOB_GUARDIAN_LAND_DEATH("mob.guardian.land.death", "entity.elder_guardian.death_land", SoundCategory.HOSTILE),
-    MOB_CHICKEN_HURT("mob.chicken.hurt", "entity.chicken.death", SoundCategory.NEUTRAL),
-    MOB_WOLF_STEP("mob.wolf.step", "entity.wolf.step", SoundCategory.NEUTRAL),
-    MOB_WOLF_DEATH("mob.wolf.death", "entity.wolf.death", SoundCategory.NEUTRAL),
-    MOB_WOLF_WHINE("mob.wolf.whine", "entity.wolf.whine", SoundCategory.NEUTRAL),
-    NOTE_PLING("note.pling", "block.note.pling", SoundCategory.RECORD),
-    GAME_PLAYER_HURT_FALL_SMALL("game.player.hurt.fall.small", "entity.generic.small_fall", SoundCategory.PLAYER),
-    MOB_CAT_PURREOW("mob.cat.purreow", "entity.cat.purreow", SoundCategory.NEUTRAL),
-    FIREWORKS_LARGEBLAST_FAR("fireworks.largeBlast_far", "entity.firework.large_blast_far", SoundCategory.AMBIENT),
-    MOB_SKELETON_HURT("mob.skeleton.hurt", "entity.skeleton.hurt", SoundCategory.HOSTILE),
-    MOB_SPIDER_DEATH("mob.spider.death", "entity.spider.death", SoundCategory.HOSTILE),
-    RANDOM_ANVIL_BREAK("random.anvil_break", "block.anvil.destroy", SoundCategory.BLOCK),
-    MOB_WITHER_IDLE("mob.wither.idle", "entity.wither.ambient", SoundCategory.HOSTILE),
-    MOB_GUARDIAN_ELDER_HIT("mob.guardian.elder.hit", "entity.elder_guardian.hurt", SoundCategory.HOSTILE),
-    MOB_ENDERMEN_SCREAM("mob.endermen.scream", "entity.endermen.scream", SoundCategory.HOSTILE),
-    MOB_CAT_HITT("mob.cat.hitt", "entity.cat.hurt", SoundCategory.NEUTRAL),
-    MOB_MAGMACUBE_SMALL("mob.magmacube.small", "entity.small_magmacube.squish", SoundCategory.HOSTILE),
-    FIRE_IGNITE("fire.ignite", "item.flintandsteel.use", SoundCategory.BLOCK, true),
-    MOB_ENDERDRAGON_HIT("mob.enderdragon.hit", "entity.enderdragon.hurt", SoundCategory.HOSTILE),
-    MOB_ZOMBIE_HURT("mob.zombie.hurt", "entity.zombie_villager.hurt", SoundCategory.HOSTILE),
-    RANDOM_EXPLODE("random.explode", "block.end_gateway.spawn", SoundCategory.BLOCK),
-    MOB_SLIME_ATTACK("mob.slime.attack", "entity.slime.attack", SoundCategory.HOSTILE),
-    MOB_MAGMACUBE_JUMP("mob.magmacube.jump", "entity.magmacube.jump", SoundCategory.HOSTILE),
-    RANDOM_SPLASH("random.splash", "entity.bobber.splash", SoundCategory.PLAYER),
-    MOB_HORSE_SKELETON_HIT("mob.horse.skeleton.hit", "entity.skeleton_horse.hurt", SoundCategory.NEUTRAL),
-    MOB_GHAST_MOAN("mob.ghast.moan", "entity.ghast.ambient", SoundCategory.HOSTILE),
-    MOB_GUARDIAN_CURSE("mob.guardian.curse", "entity.elder_guardian.curse", SoundCategory.HOSTILE),
-    GAME_POTION_SMASH("game.potion.smash", "block.glass.break", SoundCategory.NEUTRAL),
-    NOTE_BASSATTACK("note.bassattack", "block.note.bass", SoundCategory.RECORD),
-    GUI_BUTTON_PRESS("gui.button.press", "block.wood_pressureplate.click_on", SoundCategory.MASTER),
-    RANDOM_ORB("random.orb", "entity.experience_orb.pickup", SoundCategory.PLAYER),
-    MOB_ZOMBIE_WOODBREAK("mob.zombie.woodbreak", "entity.zombie.break_door_wood", SoundCategory.HOSTILE),
-    MOB_HORSE_ARMOR("mob.horse.armor", "entity.horse.armor", SoundCategory.NEUTRAL),
-    TILE_PISTON_IN("tile.piston.in", "block.piston.contract", SoundCategory.BLOCK),
-    MOB_CAT_MEOW("mob.cat.meow", "entity.cat.ambient", SoundCategory.NEUTRAL),
-    MOB_PIG_STEP("mob.pig.step", "entity.pig.step", SoundCategory.NEUTRAL),
-    STEP_WOOD("step.wood", "block.wood.step", SoundCategory.NEUTRAL),
-    PORTAL_TRAVEL("portal.travel", "block.portal.travel", SoundCategory.PLAYER),
-    MOB_GUARDIAN_DEATH("mob.guardian.death", "entity.guardian.death", SoundCategory.HOSTILE),
-    MOB_SKELETON_DEATH("mob.skeleton.death", "entity.skeleton.death", SoundCategory.HOSTILE),
-    MOB_HORSE_HIT("mob.horse.hit", "entity.horse.hurt", SoundCategory.NEUTRAL),
-    MOB_VILLAGER_HIT("mob.villager.hit", "entity.villager.hurt", SoundCategory.NEUTRAL),
-    MOB_HORSE_SKELETON_IDLE("mob.horse.skeleton.idle", "entity.skeleton_horse.ambient", SoundCategory.NEUTRAL),
-    RECORDS_CHIRP("records.chirp", "record.chirp", SoundCategory.RECORD),
-    MOB_RABBIT_HURT("mob.rabbit.hurt", "entity.rabbit.hurt", SoundCategory.NEUTRAL),
-    RECORDS_STAL("records.stal", "record.stal", SoundCategory.RECORD),
-    MUSIC_GAME_NETHER("music.game.nether", "music.nether", SoundCategory.MUSIC),
-    MUSIC_MENU("music.menu", "music.menu", SoundCategory.MUSIC),
-    RECORDS_MELLOHI("records.mellohi", "record.mellohi", SoundCategory.RECORD),
-    RECORDS_CAT("records.cat", "record.cat", SoundCategory.RECORD),
-    RECORDS_FAR("records.far", "record.far", SoundCategory.RECORD),
-    MUSIC_GAME_END_DRAGON("music.game.end.dragon", "music.dragon", SoundCategory.MUSIC),
-    MOB_RABBIT_DEATH("mob.rabbit.death", "entity.rabbit.death", SoundCategory.NEUTRAL),
-    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),
-    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),
-    RECORDS_STRAD("records.strad", "record.strad", SoundCategory.RECORD),
-    RECORDS_11("records.11", "record.11", SoundCategory.RECORD),
-    RECORDS_MALL("records.mall", "record.mall", SoundCategory.RECORD),
-    RECORDS_BLOCKS("records.blocks", "record.blocks", SoundCategory.RECORD),
-    RECORDS_WAIT("records.wait", "record.wait", SoundCategory.RECORD),
-    MUSIC_GAME_END_CREDITS("music.game.end.credits", "music.credits", SoundCategory.MUSIC),
-    MUSIC_GAME_CREATIVE("music.game.creative", "music.creative", SoundCategory.MUSIC);
-
-    private final String name;
-    private final String newName;
-    private final SoundCategory category;
-    private final boolean breaksound;
-
-    SoundEffect(String name, String newname, SoundCategory cat) {
-        this.category = cat;
-        this.newName = newname;
-        this.name = name;
-        this.breaksound = name.startsWith("dig.");
-    }
-    
-    SoundEffect(String name, String newname, SoundCategory cat, boolean shouldIgnore) {
-        this.category = cat;
-        this.newName = newname;
-        this.name = name;
-        this.breaksound = name.startsWith("dig.") || shouldIgnore;
-    }
-
-    public static SoundEffect getByName(String name) {
-        name = name.toLowerCase();
-        for (SoundEffect e : SoundEffect.values()) {
-            if (e.getName().equals(name))
-                return e;
-        }
-        return null;
-    }
-
-}
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+
+@Getter
+public enum SoundEffect {
+
+    MOB_HORSE_ZOMBIE_IDLE("mob.horse.zombie.idle", "entity.zombie_horse.ambient", SoundCategory.NEUTRAL),
+    NOTE_SNARE("note.snare", "block.note.snare", SoundCategory.RECORD),
+    RANDOM_WOOD_CLICK("random.wood_click", "block.wood_button.click_on", SoundCategory.BLOCK),
+    DIG_GRAVEL("dig.gravel", "block.gravel.place", SoundCategory.BLOCK),
+    RANDOM_BOWHIT("random.bowhit", "block.tripwire.detach", SoundCategory.NEUTRAL),
+    DIG_GLASS("dig.glass", "block.glass.break", SoundCategory.BLOCK),
+    MOB_ZOMBIE_SAY("mob.zombie.say", "entity.zombie_villager.ambient", SoundCategory.HOSTILE),
+    MOB_PIG_DEATH("mob.pig.death", "entity.pig.death", SoundCategory.NEUTRAL),
+    MOB_HORSE_DONKEY_HIT("mob.horse.donkey.hit", "entity.donkey.hurt", SoundCategory.NEUTRAL),
+    GAME_NEUTRAL_SWIM("game.neutral.swim", "entity.player.swim", SoundCategory.NEUTRAL),
+    GAME_PLAYER_SWIM("game.player.swim", "entity.player.swim", SoundCategory.PLAYER),
+    MOB_ENDERMEN_IDLE("mob.endermen.idle", "entity.endermen.ambient", SoundCategory.HOSTILE),
+    PORTAL_PORTAL("portal.portal", "block.portal.ambient", SoundCategory.BLOCK),
+    RANDOM_FIZZ("random.fizz", "entity.generic.extinguish_fire", SoundCategory.BLOCK),
+    NOTE_HARP("note.harp", "block.note.harp", SoundCategory.RECORD),
+    STEP_SNOW("step.snow", "block.snow.step", SoundCategory.NEUTRAL),
+    RANDOM_SUCCESSFUL_HIT("random.successful_hit", "entity.arrow.hit_player", SoundCategory.PLAYER),
+    MOB_ZOMBIEPIG_ZPIGHURT("mob.zombiepig.zpighurt", "entity.zombie_pig.hurt", SoundCategory.HOSTILE),
+    MOB_WOLF_HOWL("mob.wolf.howl", "entity.wolf.howl", SoundCategory.NEUTRAL),
+    FIREWORKS_LAUNCH("fireworks.launch", "entity.firework.launch", SoundCategory.AMBIENT),
+    MOB_COW_HURT("mob.cow.hurt", "entity.cow.death", SoundCategory.NEUTRAL),
+    FIREWORKS_LARGEBLAST("fireworks.largeBlast", "entity.firework.large_blast", SoundCategory.AMBIENT),
+    MOB_BLAZE_HIT("mob.blaze.hit", "entity.blaze.hurt", SoundCategory.HOSTILE),
+    MOB_VILLAGER_DEATH("mob.villager.death", "entity.villager.death", SoundCategory.NEUTRAL),
+    MOB_BLAZE_DEATH("mob.blaze.death", "entity.blaze.death", SoundCategory.HOSTILE),
+    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),
+    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),
+    MOB_SLIME_SMALL("mob.slime.small", "block.slime.hit", SoundCategory.HOSTILE),
+    MOB_GHAST_DEATH("mob.ghast.death", "entity.ghast.death", SoundCategory.HOSTILE),
+    MOB_GUARDIAN_ATTACK("mob.guardian.attack", "entity.guardian.attack", SoundCategory.HOSTILE),
+    RANDOM_CLICK("random.click", "block.wood_pressureplate.click_on", SoundCategory.BLOCK),
+    MOB_ZOMBIEPIG_ZPIG("mob.zombiepig.zpig", "entity.zombie_pig.ambient", SoundCategory.HOSTILE),
+    GAME_PLAYER_DIE("game.player.die", "entity.player.death", SoundCategory.PLAYER),
+    FIREWORKS_TWINKLE_FAR("fireworks.twinkle_far", "entity.firework.twinkle_far", SoundCategory.AMBIENT),
+    MOB_GUARDIAN_LAND_IDLE("mob.guardian.land.idle", "entity.guardian.ambient_land", SoundCategory.HOSTILE),
+    DIG_GRASS("dig.grass", "block.grass.place", SoundCategory.BLOCK),
+    MOB_SKELETON_STEP("mob.skeleton.step", "entity.skeleton.step", SoundCategory.HOSTILE),
+    MOB_WITHER_DEATH("mob.wither.death", "entity.wither.death", SoundCategory.HOSTILE),
+    MOB_WOLF_HURT("mob.wolf.hurt", "entity.wolf.hurt", SoundCategory.NEUTRAL),
+    MOB_HORSE_LEATHER("mob.horse.leather", "entity.horse.saddle", SoundCategory.NEUTRAL),
+    MOB_BAT_LOOP("mob.bat.loop", "entity.bat.loop", SoundCategory.NEUTRAL),
+    MOB_GHAST_SCREAM("mob.ghast.scream", "entity.ghast.hurt", SoundCategory.HOSTILE),
+    GAME_PLAYER_HURT("game.player.hurt", "entity.player.death", SoundCategory.PLAYER),
+    GAME_NEUTRAL_DIE("game.neutral.die", "entity.player.death", SoundCategory.NEUTRAL),
+    MOB_CREEPER_DEATH("mob.creeper.death", "entity.creeper.death", SoundCategory.HOSTILE),
+    MOB_HORSE_GALLOP("mob.horse.gallop", "entity.horse.gallop", SoundCategory.NEUTRAL),
+    MOB_WITHER_SPAWN("mob.wither.spawn", "entity.wither.spawn", SoundCategory.HOSTILE),
+    MOB_ENDERMEN_HIT("mob.endermen.hit", "entity.endermen.hurt", SoundCategory.HOSTILE),
+    MOB_CREEPER_SAY("mob.creeper.say", "entity.creeper.hurt", SoundCategory.HOSTILE),
+    MOB_HORSE_WOOD("mob.horse.wood", "entity.horse.step_wood", SoundCategory.NEUTRAL),
+    MOB_ZOMBIE_UNFECT("mob.zombie.unfect", "entity.zombie_villager.converted", SoundCategory.HOSTILE),
+    RANDOM_ANVIL_USE("random.anvil_use", "block.anvil.use", SoundCategory.BLOCK),
+    RANDOM_CHESTCLOSED("random.chestclosed", "block.enderchest.close", SoundCategory.BLOCK),
+    MOB_SHEEP_SHEAR("mob.sheep.shear", "entity.sheep.shear", SoundCategory.NEUTRAL),
+    RANDOM_POP("random.pop", "entity.item.pickup", SoundCategory.PLAYER),
+    MOB_BAT_DEATH("mob.bat.death", "entity.bat.death", SoundCategory.NEUTRAL),
+    DIG_WOOD("dig.wood", "block.ladder.break", SoundCategory.BLOCK),
+    MOB_HORSE_DONKEY_DEATH("mob.horse.donkey.death", "entity.donkey.death", SoundCategory.NEUTRAL),
+    FIREWORKS_BLAST("fireworks.blast", "entity.firework.blast", SoundCategory.AMBIENT),
+    MOB_ZOMBIEPIG_ZPIGANGRY("mob.zombiepig.zpigangry", "entity.zombie_pig.angry", SoundCategory.HOSTILE),
+    GAME_HOSTILE_SWIM("game.hostile.swim", "entity.player.swim", SoundCategory.HOSTILE),
+    MOB_GUARDIAN_FLOP("mob.guardian.flop", "entity.guardian.flop", SoundCategory.HOSTILE),
+    MOB_VILLAGER_YES("mob.villager.yes", "entity.villager.yes", SoundCategory.NEUTRAL),
+    MOB_GHAST_CHARGE("mob.ghast.charge", "entity.ghast.warn", SoundCategory.HOSTILE),
+    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),
+    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),
+    AMBIENT_WEATHER_RAIN("ambient.weather.rain", "weather.rain.above", SoundCategory.WEATHER),
+    PORTAL_TRIGGER("portal.trigger", "block.portal.trigger", SoundCategory.BLOCK),
+    RANDOM_CHESTOPEN("random.chestopen", "block.enderchest.open", SoundCategory.BLOCK),
+    MOB_HORSE_LAND("mob.horse.land", "entity.horse.land", SoundCategory.NEUTRAL),
+    MOB_SILVERFISH_STEP("mob.silverfish.step", "entity.silverfish.step", SoundCategory.HOSTILE),
+    MOB_BAT_TAKEOFF("mob.bat.takeoff", "entity.bat.takeoff", SoundCategory.NEUTRAL),
+    MOB_VILLAGER_NO("mob.villager.no", "entity.villager.no", SoundCategory.NEUTRAL),
+    GAME_HOSTILE_HURT_FALL_BIG("game.hostile.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.HOSTILE),
+    MOB_IRONGOLEM_WALK("mob.irongolem.walk", "entity.irongolem.step", SoundCategory.NEUTRAL),
+    NOTE_HAT("note.hat", "block.note.hat", SoundCategory.RECORD),
+    MOB_ZOMBIE_METAL("mob.zombie.metal", "entity.zombie.attack_iron_door", SoundCategory.HOSTILE),
+    MOB_VILLAGER_HAGGLE("mob.villager.haggle", "entity.villager.trading", SoundCategory.NEUTRAL),
+    MOB_GHAST_FIREBALL("mob.ghast.fireball", "entity.blaze.shoot", SoundCategory.HOSTILE),
+    MOB_IRONGOLEM_DEATH("mob.irongolem.death", "entity.irongolem.death", SoundCategory.NEUTRAL),
+    RANDOM_BREAK("random.break", "item.shield.break", SoundCategory.PLAYER),
+    MOB_ZOMBIE_REMEDY("mob.zombie.remedy", "entity.zombie_villager.cure", SoundCategory.HOSTILE),
+    RANDOM_BOW("random.bow", "entity.splash_potion.throw", SoundCategory.NEUTRAL),
+    MOB_VILLAGER_IDLE("mob.villager.idle", "entity.villager.ambient", SoundCategory.NEUTRAL),
+    STEP_CLOTH("step.cloth", "block.cloth.fall", SoundCategory.NEUTRAL),
+    MOB_SILVERFISH_HIT("mob.silverfish.hit", "entity.endermite.hurt", SoundCategory.HOSTILE),
+    LIQUID_LAVA("liquid.lava", "block.lava.ambient", SoundCategory.BLOCK),
+    GAME_NEUTRAL_HURT_FALL_BIG("game.neutral.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.NEUTRAL),
+    FIRE_FIRE("fire.fire", "block.fire.ambient", SoundCategory.BLOCK),
+    MOB_ZOMBIE_WOOD("mob.zombie.wood", "entity.zombie.attack_door_wood", SoundCategory.HOSTILE),
+    MOB_CHICKEN_STEP("mob.chicken.step", "entity.chicken.step", SoundCategory.NEUTRAL),
+    MOB_GUARDIAN_LAND_HIT("mob.guardian.land.hit", "entity.guardian.hurt_land", SoundCategory.HOSTILE),
+    MOB_CHICKEN_PLOP("mob.chicken.plop", "entity.donkey.chest", SoundCategory.NEUTRAL),
+    MOB_ENDERDRAGON_WINGS("mob.enderdragon.wings", "entity.enderdragon.flap", SoundCategory.HOSTILE),
+    STEP_GRASS("step.grass", "block.grass.hit", SoundCategory.NEUTRAL),
+    MOB_HORSE_BREATHE("mob.horse.breathe", "entity.horse.breathe", SoundCategory.NEUTRAL),
+    GAME_PLAYER_HURT_FALL_BIG("game.player.hurt.fall.big", "entity.hostile.big_fall", SoundCategory.PLAYER),
+    MOB_HORSE_DONKEY_IDLE("mob.horse.donkey.idle", "entity.donkey.ambient", SoundCategory.NEUTRAL),
+    MOB_SPIDER_STEP("mob.spider.step", "entity.spider.step", SoundCategory.HOSTILE),
+    GAME_NEUTRAL_HURT("game.neutral.hurt", "entity.player.death", SoundCategory.NEUTRAL),
+    MOB_COW_SAY("mob.cow.say", "entity.cow.ambient", SoundCategory.NEUTRAL),
+    MOB_HORSE_JUMP("mob.horse.jump", "entity.horse.jump", SoundCategory.NEUTRAL),
+    MOB_HORSE_SOFT("mob.horse.soft", "entity.horse.step", SoundCategory.NEUTRAL),
+    GAME_NEUTRAL_SWIM_SPLASH("game.neutral.swim.splash", "entity.generic.splash", SoundCategory.NEUTRAL),
+    MOB_GUARDIAN_HIT("mob.guardian.hit", "entity.guardian.hurt", SoundCategory.HOSTILE),
+    MOB_ENDERDRAGON_END("mob.enderdragon.end", "entity.enderdragon.death", SoundCategory.HOSTILE),
+    MOB_ZOMBIE_STEP("mob.zombie.step", "entity.zombie.step", SoundCategory.HOSTILE),
+    MOB_ENDERDRAGON_GROWL("mob.enderdragon.growl", "entity.enderdragon.growl", SoundCategory.HOSTILE),
+    MOB_WOLF_SHAKE("mob.wolf.shake", "entity.wolf.shake", SoundCategory.NEUTRAL),
+    MOB_ENDERMEN_DEATH("mob.endermen.death", "entity.endermen.death", SoundCategory.HOSTILE),
+    RANDOM_ANVIL_LAND("random.anvil_land", "block.anvil.land", SoundCategory.BLOCK),
+    GAME_HOSTILE_HURT("game.hostile.hurt", "entity.player.death", SoundCategory.HOSTILE),
+    MINECART_INSIDE("minecart.inside", "entity.minecart.inside", SoundCategory.PLAYER),
+    MOB_SLIME_BIG("mob.slime.big", "entity.slime.death", SoundCategory.HOSTILE),
+    LIQUID_WATER("liquid.water", "block.water.ambient", SoundCategory.BLOCK),
+    MOB_PIG_SAY("mob.pig.say", "entity.pig.ambient", SoundCategory.NEUTRAL),
+    MOB_WITHER_SHOOT("mob.wither.shoot", "entity.wither.shoot", SoundCategory.HOSTILE),
+    ITEM_FIRECHARGE_USE("item.fireCharge.use", "entity.blaze.shoot", SoundCategory.BLOCK),
+    STEP_SAND("step.sand", "block.sand.fall", SoundCategory.NEUTRAL),
+    MOB_IRONGOLEM_HIT("mob.irongolem.hit", "entity.irongolem.hurt", SoundCategory.NEUTRAL),
+    MOB_HORSE_DEATH("mob.horse.death", "entity.horse.death", SoundCategory.NEUTRAL),
+    MOB_BAT_HURT("mob.bat.hurt", "entity.bat.hurt", SoundCategory.NEUTRAL),
+    MOB_GHAST_AFFECTIONATE_SCREAM("mob.ghast.affectionate_scream", "entity.ghast.scream", SoundCategory.HOSTILE),
+    MOB_GUARDIAN_ELDER_IDLE("mob.guardian.elder.idle", "entity.elder_guardian.ambient", SoundCategory.HOSTILE),
+    MOB_ZOMBIEPIG_ZPIGDEATH("mob.zombiepig.zpigdeath", "entity.zombie_pig.death", SoundCategory.HOSTILE),
+    AMBIENT_WEATHER_THUNDER("ambient.weather.thunder", "entity.lightning.thunder", SoundCategory.WEATHER),
+    MINECART_BASE("minecart.base", "entity.minecart.riding", SoundCategory.NEUTRAL),
+    STEP_LADDER("step.ladder", "block.ladder.hit", SoundCategory.NEUTRAL),
+    MOB_HORSE_DONKEY_ANGRY("mob.horse.donkey.angry", "entity.donkey.angry", SoundCategory.NEUTRAL),
+    AMBIENT_CAVE_CAVE("ambient.cave.cave", "ambient.cave", SoundCategory.AMBIENT),
+    FIREWORKS_BLAST_FAR("fireworks.blast_far", "entity.firework.blast_far", SoundCategory.AMBIENT),
+    GAME_NEUTRAL_HURT_FALL_SMALL("game.neutral.hurt.fall.small", "entity.generic.small_fall", SoundCategory.NEUTRAL),
+    GAME_HOSTILE_SWIM_SPLASH("game.hostile.swim.splash", "entity.generic.splash", SoundCategory.HOSTILE),
+    RANDOM_DRINK("random.drink", "entity.generic.drink", SoundCategory.PLAYER),
+    GAME_HOSTILE_DIE("game.hostile.die", "entity.player.death", SoundCategory.HOSTILE),
+    MOB_CAT_HISS("mob.cat.hiss", "entity.cat.hiss", SoundCategory.NEUTRAL),
+    NOTE_BD("note.bd", "block.note.basedrum", SoundCategory.RECORD),
+    MOB_SPIDER_SAY("mob.spider.say", "entity.spider.hurt", SoundCategory.HOSTILE),
+    STEP_STONE("step.stone", "block.anvil.hit", SoundCategory.NEUTRAL, true), //Is used for glass placement sound
+    RANDOM_LEVELUP("random.levelup", "entity.player.levelup", SoundCategory.PLAYER),
+    LIQUID_LAVAPOP("liquid.lavapop", "block.lava.pop", SoundCategory.BLOCK),
+    MOB_SHEEP_SAY("mob.sheep.say", "entity.sheep.ambient", SoundCategory.NEUTRAL),
+    MOB_SKELETON_SAY("mob.skeleton.say", "entity.skeleton.ambient", SoundCategory.HOSTILE),
+    MOB_BLAZE_BREATHE("mob.blaze.breathe", "entity.blaze.ambient", SoundCategory.HOSTILE),
+    MOB_BAT_IDLE("mob.bat.idle", "entity.bat.ambient", SoundCategory.NEUTRAL),
+    MOB_MAGMACUBE_BIG("mob.magmacube.big", "entity.magmacube.squish", SoundCategory.HOSTILE),
+    MOB_HORSE_IDLE("mob.horse.idle", "entity.horse.ambient", SoundCategory.NEUTRAL),
+    GAME_HOSTILE_HURT_FALL_SMALL("game.hostile.hurt.fall.small", "entity.generic.small_fall", SoundCategory.HOSTILE),
+    MOB_HORSE_ZOMBIE_HIT("mob.horse.zombie.hit", "entity.zombie_horse.hurt", SoundCategory.NEUTRAL),
+    MOB_IRONGOLEM_THROW("mob.irongolem.throw", "entity.irongolem.attack", SoundCategory.NEUTRAL),
+    DIG_CLOTH("dig.cloth", "block.cloth.place", SoundCategory.BLOCK),
+    STEP_GRAVEL("step.gravel", "block.gravel.hit", SoundCategory.NEUTRAL),
+    MOB_SILVERFISH_SAY("mob.silverfish.say", "entity.silverfish.ambient", SoundCategory.HOSTILE),
+    MOB_CAT_PURR("mob.cat.purr", "entity.cat.purr", SoundCategory.NEUTRAL),
+    MOB_ZOMBIE_INFECT("mob.zombie.infect", "entity.zombie.infect", SoundCategory.HOSTILE),
+    RANDOM_EAT("random.eat", "entity.generic.eat", SoundCategory.PLAYER),
+    MOB_WOLF_BARK("mob.wolf.bark", "entity.wolf.ambient", SoundCategory.NEUTRAL),
+    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),
+    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),
+    DIG_SNOW("dig.snow", "block.snow.place", SoundCategory.BLOCK),
+    TILE_PISTON_OUT("tile.piston.out", "block.piston.extend", SoundCategory.BLOCK),
+    RANDOM_BURP("random.burp", "entity.player.burp", SoundCategory.PLAYER),
+    MOB_COW_STEP("mob.cow.step", "entity.cow.step", SoundCategory.NEUTRAL),
+    MOB_WITHER_HURT("mob.wither.hurt", "entity.wither.hurt", SoundCategory.HOSTILE),
+    MOB_GUARDIAN_LAND_DEATH("mob.guardian.land.death", "entity.elder_guardian.death_land", SoundCategory.HOSTILE),
+    MOB_CHICKEN_HURT("mob.chicken.hurt", "entity.chicken.death", SoundCategory.NEUTRAL),
+    MOB_WOLF_STEP("mob.wolf.step", "entity.wolf.step", SoundCategory.NEUTRAL),
+    MOB_WOLF_DEATH("mob.wolf.death", "entity.wolf.death", SoundCategory.NEUTRAL),
+    MOB_WOLF_WHINE("mob.wolf.whine", "entity.wolf.whine", SoundCategory.NEUTRAL),
+    NOTE_PLING("note.pling", "block.note.pling", SoundCategory.RECORD),
+    GAME_PLAYER_HURT_FALL_SMALL("game.player.hurt.fall.small", "entity.generic.small_fall", SoundCategory.PLAYER),
+    MOB_CAT_PURREOW("mob.cat.purreow", "entity.cat.purreow", SoundCategory.NEUTRAL),
+    FIREWORKS_LARGEBLAST_FAR("fireworks.largeBlast_far", "entity.firework.large_blast_far", SoundCategory.AMBIENT),
+    MOB_SKELETON_HURT("mob.skeleton.hurt", "entity.skeleton.hurt", SoundCategory.HOSTILE),
+    MOB_SPIDER_DEATH("mob.spider.death", "entity.spider.death", SoundCategory.HOSTILE),
+    RANDOM_ANVIL_BREAK("random.anvil_break", "block.anvil.destroy", SoundCategory.BLOCK),
+    MOB_WITHER_IDLE("mob.wither.idle", "entity.wither.ambient", SoundCategory.HOSTILE),
+    MOB_GUARDIAN_ELDER_HIT("mob.guardian.elder.hit", "entity.elder_guardian.hurt", SoundCategory.HOSTILE),
+    MOB_ENDERMEN_SCREAM("mob.endermen.scream", "entity.endermen.scream", SoundCategory.HOSTILE),
+    MOB_CAT_HITT("mob.cat.hitt", "entity.cat.hurt", SoundCategory.NEUTRAL),
+    MOB_MAGMACUBE_SMALL("mob.magmacube.small", "entity.small_magmacube.squish", SoundCategory.HOSTILE),
+    FIRE_IGNITE("fire.ignite", "item.flintandsteel.use", SoundCategory.BLOCK, true),
+    MOB_ENDERDRAGON_HIT("mob.enderdragon.hit", "entity.enderdragon.hurt", SoundCategory.HOSTILE),
+    MOB_ZOMBIE_HURT("mob.zombie.hurt", "entity.zombie_villager.hurt", SoundCategory.HOSTILE),
+    RANDOM_EXPLODE("random.explode", "block.end_gateway.spawn", SoundCategory.BLOCK),
+    MOB_SLIME_ATTACK("mob.slime.attack", "entity.slime.attack", SoundCategory.HOSTILE),
+    MOB_MAGMACUBE_JUMP("mob.magmacube.jump", "entity.magmacube.jump", SoundCategory.HOSTILE),
+    RANDOM_SPLASH("random.splash", "entity.bobber.splash", SoundCategory.PLAYER),
+    MOB_HORSE_SKELETON_HIT("mob.horse.skeleton.hit", "entity.skeleton_horse.hurt", SoundCategory.NEUTRAL),
+    MOB_GHAST_MOAN("mob.ghast.moan", "entity.ghast.ambient", SoundCategory.HOSTILE),
+    MOB_GUARDIAN_CURSE("mob.guardian.curse", "entity.elder_guardian.curse", SoundCategory.HOSTILE),
+    GAME_POTION_SMASH("game.potion.smash", "block.glass.break", SoundCategory.NEUTRAL),
+    NOTE_BASSATTACK("note.bassattack", "block.note.bass", SoundCategory.RECORD),
+    GUI_BUTTON_PRESS("gui.button.press", "block.wood_pressureplate.click_on", SoundCategory.MASTER),
+    RANDOM_ORB("random.orb", "entity.experience_orb.pickup", SoundCategory.PLAYER),
+    MOB_ZOMBIE_WOODBREAK("mob.zombie.woodbreak", "entity.zombie.break_door_wood", SoundCategory.HOSTILE),
+    MOB_HORSE_ARMOR("mob.horse.armor", "entity.horse.armor", SoundCategory.NEUTRAL),
+    TILE_PISTON_IN("tile.piston.in", "block.piston.contract", SoundCategory.BLOCK),
+    MOB_CAT_MEOW("mob.cat.meow", "entity.cat.ambient", SoundCategory.NEUTRAL),
+    MOB_PIG_STEP("mob.pig.step", "entity.pig.step", SoundCategory.NEUTRAL),
+    STEP_WOOD("step.wood", "block.wood.step", SoundCategory.NEUTRAL),
+    PORTAL_TRAVEL("portal.travel", "block.portal.travel", SoundCategory.PLAYER),
+    MOB_GUARDIAN_DEATH("mob.guardian.death", "entity.guardian.death", SoundCategory.HOSTILE),
+    MOB_SKELETON_DEATH("mob.skeleton.death", "entity.skeleton.death", SoundCategory.HOSTILE),
+    MOB_HORSE_HIT("mob.horse.hit", "entity.horse.hurt", SoundCategory.NEUTRAL),
+    MOB_VILLAGER_HIT("mob.villager.hit", "entity.villager.hurt", SoundCategory.NEUTRAL),
+    MOB_HORSE_SKELETON_IDLE("mob.horse.skeleton.idle", "entity.skeleton_horse.ambient", SoundCategory.NEUTRAL),
+    RECORDS_CHIRP("records.chirp", "record.chirp", SoundCategory.RECORD),
+    MOB_RABBIT_HURT("mob.rabbit.hurt", "entity.rabbit.hurt", SoundCategory.NEUTRAL),
+    RECORDS_STAL("records.stal", "record.stal", SoundCategory.RECORD),
+    MUSIC_GAME_NETHER("music.game.nether", "music.nether", SoundCategory.MUSIC),
+    MUSIC_MENU("music.menu", "music.menu", SoundCategory.MUSIC),
+    RECORDS_MELLOHI("records.mellohi", "record.mellohi", SoundCategory.RECORD),
+    RECORDS_CAT("records.cat", "record.cat", SoundCategory.RECORD),
+    RECORDS_FAR("records.far", "record.far", SoundCategory.RECORD),
+    MUSIC_GAME_END_DRAGON("music.game.end.dragon", "music.dragon", SoundCategory.MUSIC),
+    MOB_RABBIT_DEATH("mob.rabbit.death", "entity.rabbit.death", SoundCategory.NEUTRAL),
+    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),
+    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),
+    RECORDS_STRAD("records.strad", "record.strad", SoundCategory.RECORD),
+    RECORDS_11("records.11", "record.11", SoundCategory.RECORD),
+    RECORDS_MALL("records.mall", "record.mall", SoundCategory.RECORD),
+    RECORDS_BLOCKS("records.blocks", "record.blocks", SoundCategory.RECORD),
+    RECORDS_WAIT("records.wait", "record.wait", SoundCategory.RECORD),
+    MUSIC_GAME_END_CREDITS("music.game.end.credits", "music.credits", SoundCategory.MUSIC),
+    MUSIC_GAME_CREATIVE("music.game.creative", "music.creative", SoundCategory.MUSIC);
+
+    private final String name;
+    private final String newName;
+    private final SoundCategory category;
+    private final boolean breaksound;
+
+    private static HashMap<String, SoundEffect> effects;
+    static {
+        effects = new HashMap<String, SoundEffect>();
+        for(SoundEffect e : SoundEffect.values()) {
+            effects.put(e.getName(), e);
+        }
+    }
+
+    SoundEffect(String name, String newname, SoundCategory cat) {
+        this.category = cat;
+        this.newName = newname;
+        this.name = name;
+        this.breaksound = name.startsWith("dig.");
+    }
+
+    SoundEffect(String name, String newname, SoundCategory cat, boolean shouldIgnore) {
+        this.category = cat;
+        this.newName = newname;
+        this.name = name;
+        this.breaksound = name.startsWith("dig.") || shouldIgnore;
+    }
+
+    public static SoundEffect getByName(String name) {
+        name = name.toLowerCase();
+        if(effects.containsKey(name))
+            return effects.get(name);
+        return null;
+    }
+
+}

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

@@ -0,0 +1,64 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.storage;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import lombok.Getter;
+import org.bukkit.Bukkit;
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.util.ReflectionUtil;
+
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+
+@Getter
+public class ClientChunks extends StoredObject {
+    // Reflection
+    private static ReflectionUtil.ClassReflection mapChunkBulkRef;
+    private static ReflectionUtil.ClassReflection mapChunkRef;
+
+    static {
+        try {
+            mapChunkBulkRef = new ReflectionUtil.ClassReflection(ReflectionUtil.nms("PacketPlayOutMapChunkBulk"));
+            mapChunkRef = new ReflectionUtil.ClassReflection(ReflectionUtil.nms("PacketPlayOutMapChunk"));
+        } catch (Exception e) {
+            Bukkit.getLogger().log(Level.WARNING, "Failed to initialise chunk reflection", e);
+        }
+    }
+
+    private final Set<Long> loadedChunks = Sets.newConcurrentHashSet();
+    private final Set<Long> bulkChunks = Sets.newConcurrentHashSet();
+
+    public ClientChunks(UserConnection user) {
+        super(user);
+    }
+
+    private static long toLong(int msw, int lsw) {
+        return ((long) msw << 32) + lsw - -2147483648L;
+    }
+
+    public List<Object> transformMapChunkBulk(Object packet) {
+        List<Object> list = Lists.newArrayList();
+        try {
+            int[] xcoords = mapChunkBulkRef.getFieldValue("a", packet, int[].class);
+            int[] zcoords = mapChunkBulkRef.getFieldValue("b", packet, int[].class);
+            Object[] chunkMaps = mapChunkBulkRef.getFieldValue("c", packet, Object[].class);
+            for (int i = 0; i < chunkMaps.length; i++) {
+                int x = xcoords[i];
+                int z = zcoords[i];
+                Object chunkMap = chunkMaps[i];
+                Object chunkPacket = mapChunkRef.newInstance();
+                mapChunkRef.setFieldValue("a", chunkPacket, x);
+                mapChunkRef.setFieldValue("b", chunkPacket, z);
+                mapChunkRef.setFieldValue("c", chunkPacket, chunkMap);
+                mapChunkRef.setFieldValue("d", chunkPacket, true); // Chunk bulk chunks are always ground-up
+                bulkChunks.add(toLong(x, z)); // Store for later
+                list.add(chunkPacket);
+            }
+        } catch (Exception e) {
+            Bukkit.getLogger().log(Level.WARNING, "Failed to transform chunk bulk", e);
+        }
+        return list;
+    }
+}

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

@@ -0,0 +1,232 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.storage;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import io.netty.buffer.ByteBuf;
+import lombok.Getter;
+import lombok.Setter;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.boss.BossBar;
+import us.myles.ViaVersion.api.boss.BossColor;
+import us.myles.ViaVersion.api.boss.BossStyle;
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+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.protocols.base.ProtocolInfo;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+@Getter
+public class EntityTracker extends StoredObject {
+    private final Map<Integer, UUID> uuidMap = new HashMap<>();
+    private final Map<Integer, EntityType> clientEntityTypes = new HashMap<>();
+    private final Map<Integer, Integer> vehicleMap = new HashMap<>();
+    private final Map<Integer, BossBar> bossBarMap = new HashMap<>();
+    private final Set<Integer> validBlocking = new HashSet<>();
+    private final Set<Integer> knownHolograms = new HashSet<>();
+    private final Cache<Position, Material> blockInteractions = CacheBuilder.newBuilder().maximumSize(10).expireAfterAccess(250, TimeUnit.MILLISECONDS).build();
+    @Setter
+    private boolean blocking = false;
+    @Setter
+    private boolean autoTeam = false;
+    @Setter
+    private Long lastPlaceBlock = -1L;
+    @Setter
+    private int entityID;
+    private boolean teamExists = false;
+
+    public EntityTracker(UserConnection user) {
+        super(user);
+    }
+
+    public UUID getEntityUUID(int id) {
+        if (uuidMap.containsKey(id)) {
+            return uuidMap.get(id);
+        } else {
+            UUID uuid = UUID.randomUUID();
+            uuidMap.put(id, uuid);
+            return uuid;
+        }
+    }
+
+    public void setSecondHand(Item item) {
+        setSecondHand(entityID, item);
+    }
+
+    public void setSecondHand(int entityID, Item item) {
+        PacketWrapper wrapper = new PacketWrapper(0x3C, null, getUser());
+        wrapper.write(Type.VAR_INT, entityID);
+        wrapper.write(Type.VAR_INT, 1); // slot
+        wrapper.write(Type.ITEM, item);
+        try {
+            wrapper.send();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void removeEntity(Integer entityID) {
+        clientEntityTypes.remove(entityID);
+        vehicleMap.remove(entityID);
+        uuidMap.remove(entityID);
+        validBlocking.remove(entityID);
+        knownHolograms.remove(entityID);
+
+        BossBar bar = bossBarMap.remove(entityID);
+        if (bar != null) {
+            bar.hide();
+        }
+    }
+
+    public boolean interactedBlockRecently(int x, int y, int z) {
+        if(blockInteractions.size() == 0)
+            return false;
+        Iterator<Position> it = blockInteractions.asMap().keySet().iterator();
+        while(it.hasNext()) {
+            Position p = it.next();
+            if(p.getX() == x)
+                if(p.getY() == y)
+                    if(p.getZ() == z)
+                        return true;
+        }
+        return false;
+    }
+
+    public void addBlockInteraction(Position p) {
+        blockInteractions.put(p,Material.AIR);
+    }
+
+    public void handleMetadata(int entityID, List<Metadata> metadataList) {
+        if (!clientEntityTypes.containsKey(entityID)) return;
+
+        EntityType type = clientEntityTypes.get(entityID);
+        for (Metadata metadata : new ArrayList<>(metadataList)) {
+            // Fix: wither (crash fix)
+            if (type == EntityType.WITHER) {
+                if (metadata.getId() == 10) {
+                    metadataList.remove(metadata);
+                    //metadataList.add(new Metadata(10, NewType.Byte.getTypeID(), Type.BYTE, 0));
+                }
+            }
+            // Fix: enderdragon (crash fix)
+            if (type == EntityType.ENDER_DRAGON) {
+                if (metadata.getId() == 11) {
+                    metadataList.remove(metadata);
+                    //   metadataList.add(new Metadata(11, NewType.Byte.getTypeID(), Type.VAR_INT, 0));
+                }
+            }
+
+            if (type == EntityType.PLAYER) {
+                if (metadata.getId() == 0) {
+                    // Byte
+                    byte data = (byte) metadata.getValue();
+                    if (entityID != getEntityID() && ((ViaVersionPlugin) ViaVersion.getInstance()).isShieldBlocking()) {
+                        if ((data & 0x10) == 0x10) {
+                            if (validBlocking.contains(entityID)) {
+                                Item shield = new Item((short) 442, (byte) 1, (short) 0, null);
+                                setSecondHand(entityID, shield);
+                            }
+                        } else {
+                            setSecondHand(entityID, null);
+                        }
+                    }
+                }
+            }
+            if (type == EntityType.ARMOR_STAND && ((ViaVersionPlugin) ViaVersion.getInstance()).isHologramPatch()) {
+                if (metadata.getId() == 0) {
+                    byte data = (byte) metadata.getValue();
+                    if ((data & 0x20) == 0x20) {
+                        if (!knownHolograms.contains(entityID)) {
+                            knownHolograms.add(entityID);
+                            try {
+                                // Send movement
+                                ByteBuf buf = getUser().getChannel().alloc().buffer();
+                                Type.VAR_INT.write(buf, 0x25); // Relative Move Packet
+                                Type.VAR_INT.write(buf, entityID);
+                                buf.writeShort(0);
+                                buf.writeShort((short) (128D * (((ViaVersionPlugin) ViaVersion.getInstance()).getHologramYOffset() * 32D)));
+                                buf.writeShort(0);
+                                buf.writeBoolean(true);
+                                getUser().sendRawPacket(buf, false);
+                            } catch (Exception ignored) {
+                            }
+                        }
+                    }
+                }
+            }
+            Player player = Bukkit.getPlayer(getUser().get(ProtocolInfo.class).getUuid());
+            // Boss bar
+            if (((ViaVersionPlugin) ViaVersion.getInstance()).isBossbarPatch()) {
+                if (type == EntityType.ENDER_DRAGON || type == EntityType.WITHER) {
+                    if (metadata.getId() == 2) {
+                        BossBar bar = bossBarMap.get(entityID);
+                        String title = (String) metadata.getValue();
+                        title = title.isEmpty() ? (type == EntityType.ENDER_DRAGON ? "Ender Dragon" : "Wither") : title;
+                        if (bar == null) {
+                            bar = ViaVersion.getInstance().createBossBar(title, BossColor.PINK, BossStyle.SOLID);
+                            bossBarMap.put(entityID, bar);
+                            bar.addPlayer(player);
+                            bar.show();
+                        } else {
+                            bar.setTitle(title);
+                        }
+                    } else if (metadata.getId() == 6 && !((ViaVersionPlugin) ViaVersion.getInstance()).isBossbarAntiflicker()) { // If anti flicker is enabled, don't update health
+                        BossBar bar = bossBarMap.get(entityID);
+                        // Make health range between 0 and 1
+                        float maxHealth = type == EntityType.ENDER_DRAGON ? 200.0f : 300.0f;
+                        float health = Math.max(0.0f, Math.min(((float) metadata.getValue()) / maxHealth, 1.0f));
+                        if (bar == null) {
+                            String title = type == EntityType.ENDER_DRAGON ? "Ender Dragon" : "Wither";
+                            bar = ViaVersion.getInstance().createBossBar(title, health, BossColor.PINK, BossStyle.SOLID);
+                            bossBarMap.put(entityID, bar);
+                            bar.addPlayer(player);
+                            bar.show();
+                        } else {
+                            bar.setHealth(health);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public void sendTeamPacket(boolean b) {
+        PacketWrapper wrapper = new PacketWrapper(0x41, null, getUser());
+        wrapper.write(Type.STRING, "viaversion"); // Use viaversion as name
+        if (b) {
+            // add
+            if (!teamExists) {
+                wrapper.write(Type.BYTE, (byte) 0); // make team
+                wrapper.write(Type.STRING, "viaversion");
+                wrapper.write(Type.STRING, ""); // prefix
+                wrapper.write(Type.STRING, ""); // suffix
+                wrapper.write(Type.BYTE, (byte) 0); // friendly fire
+                wrapper.write(Type.STRING, ""); // nametags
+                wrapper.write(Type.STRING, "never"); // collision rule :)
+                wrapper.write(Type.BYTE, (byte) 0); // color
+            } else {
+                wrapper.write(Type.BYTE, (byte) 3);
+            }
+            wrapper.write(Type.VAR_INT, 1); // player count
+            wrapper.write(Type.STRING, getUser().get(ProtocolInfo.class).getUsername());
+        } else {
+            wrapper.write(Type.BYTE, (byte) 1); // remove team
+        }
+        teamExists = b;
+        try {
+            wrapper.send();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.storage;
+
+import lombok.Getter;
+import lombok.Setter;
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+
+@Getter
+@Setter
+public class InventoryTracker extends StoredObject {
+    private String inventory;
+
+    public InventoryTracker(UserConnection user) {
+        super(user);
+    }
+}