1.9.1 support

HexagonMC · Mar 30, 2016 · 6b4e285 · 6b4e285
1 parent 891ad87
commit 6b4e285
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
@@ -108,7 +108,8 @@ public enum Protocol
     public static final int MAX_PACKET_ID = 0xFF;
     public static List<Integer> supportedVersions = Arrays.asList(
             ProtocolConstants.MINECRAFT_1_8,
-            ProtocolConstants.MINECRAFT_1_9
+            ProtocolConstants.MINECRAFT_1_9,
+            ProtocolConstants.MINECRAFT_1_9_1
     );
     /*========================================================================*/
     public final DirectionData TO_SERVER = new DirectionData( ProtocolConstants.Direction.TO_SERVER );
@@ -131,8 +132,10 @@ public class DirectionData
         {
             packetRemap.put( ProtocolConstants.MINECRAFT_1_8, new TIntIntHashMap() );
             packetRemapInv.put( ProtocolConstants.MINECRAFT_1_8, new TIntIntHashMap() );
-            packetRemap.put(ProtocolConstants.MINECRAFT_1_9, new TIntIntHashMap() );
-            packetRemapInv.put(ProtocolConstants.MINECRAFT_1_9, new TIntIntHashMap() );
+            packetRemap.put( ProtocolConstants.MINECRAFT_1_9, new TIntIntHashMap() );
+            packetRemapInv.put( ProtocolConstants.MINECRAFT_1_9, new TIntIntHashMap() );
+            packetRemap.put( ProtocolConstants.MINECRAFT_1_9_1, packetRemap.get( ProtocolConstants.MINECRAFT_1_9 ) );
+            packetRemapInv.put( ProtocolConstants.MINECRAFT_1_9_1, packetRemapInv.get( ProtocolConstants.MINECRAFT_1_9 ) );
         }
 
         public final DefinedPacket createPacket(int id, int protocol)

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -5,11 +5,14 @@
 
 public class ProtocolConstants
 {
+
     public static final int MINECRAFT_1_8 = 47;
     public static final int MINECRAFT_1_9 = 107;
+    public static final int MINECRAFT_1_9_1 = 108;
     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
             "1.8.x",
-            "1.9"
+            "1.9",
+            "1.9.1"
     );
 
     public enum Direction

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionRequest.java
@@ -24,8 +24,8 @@ public class EncryptionRequest extends DefinedPacket
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
         serverId = readString( buf );
-        publicKey = readArray( buf );
-        verifyToken = readArray( buf );
+        publicKey = readArray( buf, 128 );
+        verifyToken = readArray( buf, 128 );
     }
 
     @Override

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/EncryptionResponse.java
@@ -22,8 +22,8 @@ public class EncryptionResponse extends DefinedPacket
     @Override
     public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protocolVersion)
     {
-        sharedSecret = readArray( buf, 256 );
-        verifyToken = readArray( buf, 256 );
+        sharedSecret = readArray( buf, 128 );
+        verifyToken = readArray( buf, 128 );
     }
 
     @Override

diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Login.java
@@ -29,7 +29,13 @@ public void read(ByteBuf buf, ProtocolConstants.Direction direction, int protoco
     {
         entityId = buf.readInt();
         gameMode = buf.readUnsignedByte();
-        dimension = buf.readByte();
+        if ( protocolVersion > ProtocolConstants.MINECRAFT_1_9 )
+        {
+            dimension = buf.readInt();
+        } else
+        {
+            dimension = buf.readByte();
+        }
         difficulty = buf.readUnsignedByte();
         maxPlayers = buf.readUnsignedByte();
         levelType = readString( buf );
@@ -44,7 +50,13 @@ public void write(ByteBuf buf, ProtocolConstants.Direction direction, int protoc
     {
         buf.writeInt( entityId );
         buf.writeByte( gameMode );
-        buf.writeByte( dimension );
+        if ( protocolVersion > ProtocolConstants.MINECRAFT_1_9 )
+        {
+            buf.writeInt( dimension );
+        } else
+        {
+            buf.writeByte( dimension );
+        }
         buf.writeByte( difficulty );
         buf.writeByte( maxPlayers );
         writeString( levelType, buf );

diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
@@ -28,6 +28,7 @@ public static EntityMap getEntityMap(int version)
             case ProtocolConstants.MINECRAFT_1_8:
                 return EntityMap_1_8.INSTANCE;
             case ProtocolConstants.MINECRAFT_1_9:
+            case ProtocolConstants.MINECRAFT_1_9_1:
                 return EntityMap_1_9.INSTANCE;
         }
         throw new RuntimeException( "Version " + version + " has no entity map" );