Bump version to 0.4.6

Fix unmount

ISSUE_TEMPLATE.md

@@ -0,0 +1,10 @@
+### What version of ViaVersion are you using? Type /ver viaversion
+
+### What version of Spigot are you using? Type /ver
+
+### What plugins are you using? /plugins
+
+### How does this error happen? login? using an item? 
+
+### Is there an error in the console? Use pastebin.com. Is there a kick message?
+

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.4.0
+# ViaVersion 0.4.6
 **Allows the connection of 1.8 clients to 1.9**
 
 This plugin modifies netty to allow connection of 1.9 clients to 1.8,
@@ -28,12 +28,15 @@ Contributors:
 --------
 
 **Myself** (harhar)
-
 **Matsv/StamBoom**
-
 **HugoDaBosss**
-
 **SanderGielisse**
+**Paulomart**
+**gigosaurus**
+
+**Chat: ** https://gitter.im/MylesIsCool/ViaVersion
+
+We use it to collaborate and solve errors, sign in with github.
 
 License:
 --------
@@ -41,4 +44,6 @@ License:
 You may modify this work, all rights are still owned by myself excluding any files in the spacebase package as they belong to the respected contributors. Please credit the original author (myself) when forking etc. (or if it helped you understand the new protocol or netty!)
 
 
-Thanks!
+Thanks!
+
+

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

@@ -6,7 +6,6 @@ import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

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

@@ -1,15 +1,12 @@
 package us.myles.ViaVersion.handlers;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import us.myles.ViaVersion.CancelException;
 import us.myles.ViaVersion.ConnectionInfo;
-import us.myles.ViaVersion.util.PacketUtil;
 import us.myles.ViaVersion.transformers.IncomingTransformer;
+import us.myles.ViaVersion.util.PacketUtil;
 
 import java.util.List;
 
@@ -27,8 +24,8 @@ public class ViaDecodeHandler extends ByteToMessageDecoder {
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> list) throws Exception {
         // use transformers
-        if(bytebuf.readableBytes() > 0) {
-            if(info.isActive()) {
+        if (bytebuf.readableBytes() > 0) {
+            if (info.isActive()) {
                 int id = PacketUtil.readVarInt(bytebuf);
                 // Transform
                 ByteBuf newPacket = ctx.alloc().buffer();
@@ -36,7 +33,8 @@ public class ViaDecodeHandler extends ByteToMessageDecoder {
                     incomingTransformer.transform(id, bytebuf, newPacket);
                     bytebuf = newPacket;
                 } catch (CancelException e) {
-                    return;
+                    bytebuf.readBytes(bytebuf.readableBytes());
+                    throw e;
                 }
             }
             // call minecraft decoder
@@ -44,5 +42,15 @@ public class ViaDecodeHandler extends ByteToMessageDecoder {
         }
     }
 
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        if (!(cause.getCause().getCause() instanceof CancelException)) {
+            if (!(cause.getCause() instanceof CancelException)) {
+                if (!(cause instanceof CancelException)) {
+                    super.exceptionCaught(ctx, cause);
+                }
+            }
+        }
+    }
 
 }

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

@@ -10,6 +10,7 @@ import us.myles.ViaVersion.util.PacketUtil;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
 import java.lang.reflect.Constructor;
+import java.nio.channels.ClosedChannelException;
 
 public class ViaEncodeHandler extends MessageToByteEncoder {
     private final ConnectionInfo info;
@@ -26,11 +27,10 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
     @Override
     protected void encode(ChannelHandlerContext ctx, Object o, ByteBuf bytebuf) throws Exception {
         // handle the packet type
-        if (o == null) return;
         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")) {
+            if (o.getClass().getName().endsWith("PacketPlayOutMapChunkBulk") && info.isActive()) {
                 int[] locX = ReflectionUtil.get(o, "a", int[].class);
                 int[] locZ = ReflectionUtil.get(o, "b", int[].class);
 
@@ -45,16 +45,16 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
                     Object packet = constructor.newInstance(chunk, true, 65535);
                     ctx.pipeline().writeAndFlush(packet);
                 }
-                bytebuf.clear();
-                return;
+                bytebuf.readBytes(bytebuf.readableBytes());
+                throw new CancelException();
             }
             // call minecraft encoder
             PacketUtil.callEncode(this.minecraftEncoder, ctx, o, bytebuf);
         }
         if (bytebuf.readableBytes() == 0) {
-            return;
+            throw new CancelException();
         }
-        if(info.isActive()) {
+        if (info.isActive()) {
             int id = PacketUtil.readVarInt(bytebuf);
             // Transform
             ByteBuf oldPacket = bytebuf.copy();
@@ -62,11 +62,22 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
             try {
                 outgoingTransformer.transform(id, oldPacket, bytebuf);
             } catch (CancelException e) {
-                return;
+                bytebuf.readBytes(bytebuf.readableBytes());
+                throw e;
             } finally {
                 oldPacket.release();
             }
         }
     }
 
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        if (!(cause.getCause().getCause() instanceof CancelException)) {
+            if (!(cause.getCause() instanceof CancelException)) {
+                if (!(cause instanceof CancelException)) {
+                    super.exceptionCaught(ctx, cause);
+                }
+            }
+        }
+    }
 }

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

@@ -88,6 +88,8 @@ public enum MetaIndex {
     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),

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

@@ -0,0 +1,186 @@
+package us.myles.ViaVersion.metadata;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.util.EulerAngle;
+import org.bukkit.util.Vector;
+
+import io.netty.buffer.ByteBuf;
+
+import us.myles.ViaVersion.util.PacketUtil;
+
+public class MetadataRewriter {
+
+    public static void writeMetadata1_9(EntityType type, List<Entry> list, ByteBuf output) {
+        short id = -1;
+        int data = -1;
+        Iterator<Entry> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            Entry entry = iterator.next(); //
+            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).byteValue());
+                            }
+                            if (metaIndex.getOldType() == Type.Int) {
+                                output.writeByte(((Integer) value).byteValue());
+                            }
+                            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((UUID) toWrite, output);
+                            break;
+                        case BlockID:
+                            // if we have both sources :))
+                            if (metaIndex.getOldType() == Type.Byte) {
+                                data = ((Byte) value).byteValue();
+                            }
+                            if (metaIndex.getOldType() == Type.Short) {
+                                id = ((Short) value).shortValue();
+                            }
+                            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).intValue(), output);
+                            }
+                            break;
+                        case Float:
+                            output.writeFloat(((Float) value).floatValue());
+                            break;
+                        case String:
+                            PacketUtil.writeString((String) value, output);
+                            break;
+                        case Boolean:
+                            if(metaIndex == MetaIndex.AGEABLE_AGE)
+                                output.writeBoolean(((Byte) value).byteValue() < 0);
+                            else
+                                output.writeBoolean(((Byte) value).byteValue() != 0);
+                            break;
+                        case Slot:
+                            PacketUtil.writeItem(value, 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;
+                        default:
+                            System.out.println("[Out] Unhandled MetaDataType: " + metaIndex.getNewType());
+                            break;
+                    }
+                }
+            } catch (Exception e) {
+                if (type != null) {
+                    System.out.println("An error occurred with entity meta data for " + type);
+                    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()));
+                    break;
+                case Short:
+                    entries.add(new Entry(index, buf.readShort()));
+                    break;
+                case Int:
+                    entries.add(new Entry(index, buf.readInt()));
+                    break;
+                case Float:
+                    entries.add(new Entry(index, buf.readFloat()));
+                    break;
+                case String:
+                    entries.add(new Entry(index, PacketUtil.readString(buf)));
+                    break;
+                case Slot:
+                    entries.add(new Entry(index, PacketUtil.readItem(buf)));
+                    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)));
+                    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)));
+                    break;
+                }
+                default:
+                    System.out.println("[Out] Unhandled MetaDataType: " + type);
+                    break;
+            }
+        }
+        return entries;
+    }
+
+    public static class Entry {
+
+        private MetaIndex index;
+        private Object value;
+
+        private Entry(MetaIndex index, Object value) {
+            this.index = index;
+            this.value = value;
+        }
+    }
+}

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

@@ -18,4 +18,8 @@ public enum Type {
     public int getTypeID() {
         return typeID;
     }
+
+    public static Type byId(int id) {
+        return values()[id];
+    }
 }

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

@@ -96,7 +96,7 @@ public enum PacketType {
     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, 0x2F, 0x2F),
+    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),
@@ -170,7 +170,7 @@ public enum PacketType {
     	if(id == -1)
     		return null;
         for (PacketType pt : values()) {
-            if (pt.getNewPacketID() == id && id != -1
+            if (pt.getNewPacketID() == id
                     && pt.getState() == state
                     && pt.getDirection() == direction)
                 return pt;
@@ -182,7 +182,7 @@ public enum PacketType {
     	if(id == -1)
     		return null;
         for (PacketType pt : values()) {
-            if (pt.getPacketID() == id && id != -1
+            if (pt.getPacketID() == id
                     && pt.getState() == state
                     && pt.getDirection() == direction)
                 return pt;

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

@@ -252,11 +252,13 @@ public enum SoundEffect {
     private String name;
     private String newname;
     private SoundCategory cat;
+    private boolean breaksound;
 
     SoundEffect(String name, String newname, SoundCategory cat) {
         this.cat = cat;
         this.newname = newname;
         this.name = name;
+        this.breaksound = name.startsWith("dig.");
     }
 
     public static SoundEffect getByName(String name) {
@@ -279,5 +281,9 @@ public enum SoundEffect {
     public SoundCategory getCategory() {
         return cat;
     }
+    
+    public boolean isBreakPlaceSound() {
+    	return breaksound;
+    }
 
 }

src/main/java/us/myles/ViaVersion/transformers/OutgoingTransformer.java

@@ -2,17 +2,19 @@ package us.myles.ViaVersion.transformers;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+
 import io.netty.buffer.ByteBuf;
+
 import org.bukkit.entity.EntityType;
+import org.json.simple.parser.JSONParser;
 import org.spacehq.mc.protocol.data.game.chunk.Column;
 import org.spacehq.mc.protocol.util.NetUtil;
+
 import us.myles.ViaVersion.CancelException;
 import us.myles.ViaVersion.ConnectionInfo;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
-import us.myles.ViaVersion.metadata.MetaIndex;
-import us.myles.ViaVersion.metadata.NewType;
-import us.myles.ViaVersion.metadata.Type;
+import us.myles.ViaVersion.metadata.MetadataRewriter;
 import us.myles.ViaVersion.packets.PacketType;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.sounds.SoundEffect;
@@ -21,7 +23,6 @@ import us.myles.ViaVersion.util.PacketUtil;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 import static us.myles.ViaVersion.util.PacketUtil.*;
@@ -33,6 +34,7 @@ public class OutgoingTransformer {
     private boolean cancel = false;
     private Map<Integer, UUID> uuidMap = new HashMap<Integer, UUID>();
     private Map<Integer, EntityType> clientEntityTypes = new HashMap<Integer, EntityType>();
+    private Map<Integer, Integer> vehicleMap = new HashMap<>();
 
     public OutgoingTransformer(ConnectionInfo info) {
         this.info = info;
@@ -62,6 +64,11 @@ public class OutgoingTransformer {
             int catid = 0;
             String newname = name;
             if (effect != null) {
+            	if(effect.isBreakPlaceSound()) {
+            		input.readBytes(input.readableBytes());
+            		output.clear();
+            		return;
+            	}
                 catid = effect.getCategory().getId();
                 newname = effect.getNewName();
             }
@@ -76,8 +83,17 @@ public class OutgoingTransformer {
             if (!lead) {
                 output.clear();
                 writeVarInt(PacketType.PLAY_SET_PASSENGERS.getNewPacketID(), output);
-                writeVarInt(vehicle, output);
-                writeVarIntArray(Collections.singletonList(passenger), output);
+                if (vehicle == -1) {
+                    if (!vehicleMap.containsKey(passenger))
+                        throw new CancelException();
+                    vehicle = vehicleMap.remove(passenger);
+                    writeVarInt(vehicle,output);
+                    writeVarIntArray(Collections.<Integer>emptyList(), output);
+                } else{
+                    writeVarInt(vehicle, output);
+                    writeVarIntArray(Collections.singletonList(passenger), output);
+                    vehicleMap.put(passenger,vehicle);
+                }
                 return;
             }
             output.writeInt(passenger);
@@ -211,15 +227,7 @@ public class OutgoingTransformer {
             int id = PacketUtil.readVarInt(input);
             PacketUtil.writeVarInt(id, output);
 
-            try {
-                List dw = ReflectionUtil.get(info.getLastPacket(), "b", List.class);
-                // get entity via entityID, not preferred but we need it.
-                transformMetadata(id, dw, output);
-            } catch (NoSuchFieldException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
+            transformMetadata(id, input, output);
             return;
         }
 
@@ -358,16 +366,8 @@ public class OutgoingTransformer {
             output.writeShort(vY);
             short vZ = input.readShort();
             output.writeShort(vZ);
-            try {
-                Object dataWatcher = ReflectionUtil.get(info.getLastPacket(), "l", ReflectionUtil.nms("DataWatcher"));
-                transformMetadata(id, dataWatcher, output);
-            } catch (NoSuchFieldException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
+
+            transformMetadata(id, input, output);
             return;
         }
         if (packet == PacketType.PLAY_UPDATE_SIGN) {
@@ -411,16 +411,11 @@ public class OutgoingTransformer {
             output.writeByte(pitch);
             byte yaw = input.readByte();
             output.writeByte(yaw);
-            try {
-                Object dataWatcher = ReflectionUtil.get(info.getLastPacket(), "i", ReflectionUtil.nms("DataWatcher"));
-                transformMetadata(id, dataWatcher, output);
-            } catch (NoSuchFieldException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            }
+
+            // next field is Current Item, this was removed in 1.9 so we'll ignore it
+            input.readShort();
+
+            transformMetadata(id, input, output);
 
             return;
         }
@@ -511,140 +506,25 @@ public class OutgoingTransformer {
             if (line.startsWith("\""))
                 line = "{\"text\":" + line + "}";
         }
+        try {
+        	new JSONParser().parse(line);
+        }
+        catch (org.json.simple.parser.ParseException e) {
+        	System.out.println("Invalid JSON String: \"" + line + "\" Please report this issue to the ViaVersion Github!");
+        	return "{\"text\":\"\"}";
+        }
         return line;
     }
 
-    private void transformMetadata(int entityID, Object dw, ByteBuf output) throws CancelException {
-        // get entity
-        try {
-            transformMetadata(entityID, (List) ReflectionUtil.invoke(dw, "b"), output);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void transformMetadata(int entityID, List dw, ByteBuf output) throws CancelException {
+    private void transformMetadata(int entityID, ByteBuf input, ByteBuf output) throws CancelException {
         EntityType type = clientEntityTypes.get(entityID);
         if (type == null) {
             System.out.println("Unable to get entity for ID: " + entityID);
             output.writeByte(255);
             return;
         }
-        if (dw != null) {
-            short id = -1;
-            int data = -1;
-
-            Iterator iterator = dw.iterator();
-            while (iterator.hasNext()) {
-                Object watchableObj = iterator.next(); //
-                MetaIndex metaIndex = null;
-                try {
-                    metaIndex = MetaIndex.getIndex(type, (int) ReflectionUtil.invoke(watchableObj, "a"));
-                } catch (NoSuchMethodException e) {
-                    e.printStackTrace();
-                } catch (InvocationTargetException e) {
-                    e.printStackTrace();
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-                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 = ReflectionUtil.invoke(watchableObj, "b");
-                        switch (metaIndex.getNewType()) {
-                            case Byte:
-                                // convert from int, byte
-                                if (metaIndex.getOldType() == Type.Byte) {
-                                    output.writeByte(((Byte) value).byteValue());
-                                }
-                                if (metaIndex.getOldType() == Type.Int) {
-                                    output.writeByte(((Integer) value).byteValue());
-                                }
-                                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((UUID) toWrite, output);
-                                break;
-                            case BlockID:
-                                // if we have both sources :))
-                                if (metaIndex.getOldType() == Type.Byte) {
-                                    data = ((Byte) value).byteValue();
-                                }
-                                if (metaIndex.getOldType() == Type.Short) {
-                                    id = ((Short) value).shortValue();
-                                }
-                                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).intValue(), output);
-                                }
-                                break;
-                            case Float:
-                                output.writeFloat(((Float) value).floatValue());
-                                break;
-                            case String:
-                                PacketUtil.writeString((String) value, output);
-                                break;
-                            case Boolean:
-                                output.writeBoolean(((Byte) value).byteValue() != 0);
-                                break;
-                            case Slot:
-                                PacketUtil.writeItem(value, output);
-                                break;
-                            case Position:
-                                output.writeInt((int) ReflectionUtil.invoke(value, "getX"));
-                                output.writeInt((int) ReflectionUtil.invoke(value, "getY"));
-                                output.writeInt((int) ReflectionUtil.invoke(value, "getZ"));
-                                break;
-                            case Vector3F:
-                                output.writeFloat((float) ReflectionUtil.invoke(value, "getX"));
-                                output.writeFloat((float) ReflectionUtil.invoke(value, "getY"));
-                                output.writeFloat((float) ReflectionUtil.invoke(value, "getZ"));
-                        }
-
-                    }
-                } catch (Exception e) {
-                    if (type != null) {
-                        System.out.println("An error occurred with entity meta data for " + type);
-                        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);
-
-
+        List<MetadataRewriter.Entry> list = MetadataRewriter.readMetadata1_8(type, input);
+        MetadataRewriter.writeMetadata1_9(type, list, output);
     }
 
 

src/main/java/us/myles/ViaVersion/util/PacketUtil.java

@@ -373,6 +373,26 @@ public class PacketUtil {
         }
     }
 
+    public static Object readItem(ByteBuf output) {
+        try {
+            Class<?> serializer = ReflectionUtil.nms("PacketDataSerializer");
+            Object init = serializer.getDeclaredConstructor(ByteBuf.class).newInstance(output);
+            Method toCall = init.getClass().getDeclaredMethod("i");
+            return toCall.invoke(init);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (InstantiationException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
+		return null;
+    }
+
     public static long[] readBlockPosition(ByteBuf buf) {
         long val = buf.readLong();
         long x = (val >> 38); // signed

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: ViaVersion
 main: us.myles.ViaVersion.ViaVersionPlugin
 author: _MylesC
-version: 0.4.0
+version: 0.4.6
 load: startup
 loadbefore: [ProtocolLib, ProxyPipe]