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.4
+# 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,14 +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:
 --------
@@ -43,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/handlers/ViaDecodeHandler.java

@@ -8,7 +8,6 @@ import us.myles.ViaVersion.ConnectionInfo;
 import us.myles.ViaVersion.transformers.IncomingTransformer;
 import us.myles.ViaVersion.util.PacketUtil;
 
-import java.nio.channels.ClosedChannelException;
 import java.util.List;
 
 public class ViaDecodeHandler extends ByteToMessageDecoder {
@@ -45,14 +44,10 @@ public class ViaDecodeHandler extends ByteToMessageDecoder {
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        if (!(cause.getCause().getCause() instanceof CancelException)
-                && !(cause.getCause().getCause() instanceof ClosedChannelException)) {
-            if (!(cause.getCause() instanceof CancelException)
-                    && !(cause.getCause() instanceof ClosedChannelException)) {
-                if (!(cause instanceof CancelException)
-                        && !(cause instanceof ClosedChannelException)) {
-                    if (cause instanceof Exception)
-                        throw (Exception) cause;
+        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

@@ -72,14 +72,10 @@ public class ViaEncodeHandler extends MessageToByteEncoder {
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        if (!(cause.getCause().getCause() instanceof CancelException)
-                && !(cause.getCause().getCause() instanceof ClosedChannelException)) {
-            if (!(cause.getCause() instanceof CancelException)
-                    && !(cause.getCause() instanceof ClosedChannelException)) {
-                if (!(cause instanceof CancelException)
-                        && !(cause instanceof ClosedChannelException)) {
-                    if (cause instanceof Exception)
-                        throw (Exception) cause;
+        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/MetadataRewriter.java

@@ -86,7 +86,10 @@ public class MetadataRewriter {
                             PacketUtil.writeString((String) value, output);
                             break;
                         case Boolean:
-                            output.writeBoolean(((Byte) value).byteValue() != 0);
+                            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);

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,10 +2,14 @@ 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;
@@ -30,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;
@@ -59,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();
             }
@@ -73,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);
@@ -393,6 +412,9 @@ public class OutgoingTransformer {
             byte yaw = input.readByte();
             output.writeByte(yaw);
 
+            // next field is Current Item, this was removed in 1.9 so we'll ignore it
+            input.readShort();
+
             transformMetadata(id, input, output);
 
             return;
@@ -484,6 +506,13 @@ 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;
     }
 

src/main/resources/plugin.yml

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