Update protocol to 1.2.10

Author: HoverEpic

src/main/java/org/dragonet/proxy/protocol/ProtocolInfo.java

@@ -10,16 +10,16 @@ public class ProtocolInfo {
     /**
      * Actual Minecraft: PE protocol version
      */
-    public static final int CURRENT_PROTOCOL = 160;
+    public static final int CURRENT_PROTOCOL = 201;
     /**
      * Current Minecraft PE version reported by the server. This is usually the
      * earliest currently supported version.
      */
-    public static final String MINECRAFT_VERSION = "v1.2.8";
+    public static final String MINECRAFT_VERSION = "v1.2.10";
     /**
      * Version number sent to clients in ping responses.
      */
-    public static final String MINECRAFT_VERSION_NETWORK = "1.2.8";
+    public static final String MINECRAFT_VERSION_NETWORK = "1.2.10";
 
     public static final byte LOGIN_PACKET = (byte) 0x01;
     public static final byte PLAY_STATUS_PACKET = (byte) 0x02;

src/main/java/org/dragonet/proxy/protocol/packets/AddPlayerPacket.java

@@ -16,8 +16,11 @@ public class AddPlayerPacket extends PEPacket {
 
     public UUID uuid;
     public String username;
+    public String thirdpartyName;
+    public int platformID;
     public long eid;
     public long rtid;
+    public String platformChatID;
     public Vector3F position;
     public Vector3F motion;
     public float pitch;
@@ -40,8 +43,11 @@ public int pid() {
     public void encodePayload() {
         putUUID(uuid);
         putString(username);
+        putString(thirdpartyName);
+        putVarInt(platformID);
         putVarLong(eid);
         putUnsignedVarLong(rtid);
+        putString(platformChatID);
         putVector3F(position);
         putVector3F(motion);
         putLFloat(pitch);
@@ -54,12 +60,12 @@ public void encodePayload() {
         } else {
             putUnsignedVarInt(0);
         }
-        putUnsignedVarInt(0);
-        putUnsignedVarInt(0);
-        putUnsignedVarInt(0);
-        putUnsignedVarInt(0);
-        putUnsignedVarInt(0);
-        putLLong(0L);
+        putUnsignedVarInt(0); //Flags
+        putUnsignedVarInt(0); //Command permission
+        putUnsignedVarInt(0); //Action Permissions
+        putUnsignedVarInt(0); //Permission Level
+        putUnsignedVarInt(0); //Custom stored permissions
+        putLLong(0L);         //User Id
         if (links != null && links.length > 0) {
             putUnsignedVarInt(links.length);
             for (PEEntityLink l : links) {
@@ -101,4 +107,4 @@ public void decodePayload() {
             }
         }
     }
-}
+}

src/main/java/org/dragonet/proxy/protocol/packets/PlayerHotbarPacket.java

@@ -9,7 +9,7 @@ public class PlayerHotbarPacket extends PEPacket {
     public int selectedHotbarSlot;
     public int windowId = -1;
 
-    public int[] slots;
+//    public int[] slots;
 
     public boolean selectHotbarSlot = true;
 
@@ -22,12 +22,12 @@ public int pid() {
     public void decodePayload() {
         this.selectedHotbarSlot = (int) this.getUnsignedVarInt();
         this.windowId = this.getByte();
-        int count = (int) this.getUnsignedVarInt();
-        slots = new int[count];
-
-        for (int i = 0; i < count; ++i) {
-            this.slots[i] = Binary.signInt((int) this.getUnsignedVarInt());
-        }
+//        int count = (int) this.getUnsignedVarInt();
+//        slots = new int[count];
+//
+//        for (int i = 0; i < count; ++i) {
+//            this.slots[i] = Binary.signInt((int) this.getUnsignedVarInt());
+//        }
         this.selectHotbarSlot = this.getBoolean();
     }
 
@@ -36,10 +36,10 @@ public void encodePayload() {
         this.reset();
         this.putUnsignedVarInt(this.selectedHotbarSlot);
         this.putByte((byte) this.windowId);
-        this.putUnsignedVarInt(this.slots.length);
-        for (int i : slots) {
-            this.putUnsignedVarInt(i);
-        }
+//        this.putUnsignedVarInt(this.slots.length);
+//        for (int i : slots) {
+//            this.putUnsignedVarInt(i);
+//        }
         this.putBoolean(this.selectHotbarSlot);
     }
-}
+}

src/main/java/org/dragonet/proxy/protocol/packets/StartGamePacket.java

@@ -43,7 +43,13 @@ public class StartGamePacket extends PEPacket {
     public boolean startWithMapEnabled;
     public boolean trustPlayersEnabled;
     public int defaultPlayerPermission;
+    public int gamePublishSetting;
+    public int serverChunkTickRadius = 4; //TODO (leave as default for now)
+    public int serverChunkTickRange;
+    public boolean hasPlatformBroadcast;
+    public int platformBroadcastMode;
     public int xboxLiveBroadcastMode;
+    public boolean xboxLiveBroadcastIntent;
 
     public String levelId;
     public String worldName;
@@ -95,7 +101,13 @@ public void encodePayload() {
         putBoolean(startWithMapEnabled);
         putBoolean(trustPlayersEnabled);
         putVarInt(defaultPlayerPermission);
+        putVarInt(gamePublishSetting);
+        putVarInt(serverChunkTickRadius);
+        putVarInt(serverChunkTickRange);
+        putBoolean(hasPlatformBroadcast);
+        putVarInt(platformBroadcastMode);
         putVarInt(xboxLiveBroadcastMode);
+        putBoolean(xboxLiveBroadcastIntent);
 
         putString(levelId);
         putString(worldName);
@@ -123,7 +135,7 @@ public void decodePayload() {
         generator = getVarInt();
         worldGamemode = getVarInt();
         difficulty = Difficulty.values()[getVarInt()];
-        spawnPosition = getBlockPosition();
+        spawnPosition = getSignedBlockPosition();
         achievementsDisabled = getBoolean();
         time = getVarInt();
         eduMode = getBoolean();
@@ -139,7 +151,13 @@ public void decodePayload() {
         startWithMapEnabled = getBoolean();
         trustPlayersEnabled = getBoolean();
         defaultPlayerPermission = getVarInt();
+        gamePublishSetting = getVarInt();
+        serverChunkTickRadius = getVarInt();
+        serverChunkTickRange = getInt();
+        hasPlatformBroadcast = getBoolean();
+        platformBroadcastMode = getVarInt();
         xboxLiveBroadcastMode = getVarInt();
+        xboxLiveBroadcastIntent = getBoolean();
 
         levelId = getString();
         worldName = getString();
@@ -149,4 +167,4 @@ public void decodePayload() {
 
         enchantmentSeed = getVarInt();
     }
-}
+}