make packet cmd private.

switch to switch instead of else if tree.

Author: KonoTyran

src/main/java/gg/archipelago/client/ArchipelagoWebSocket.java

@@ -21,7 +21,7 @@ public ItemManager(ArchipelagoClient archipelagoClient) {
         this.archipelagoClient = archipelagoClient;
     }
 
-    public void receiveItems(ArrayList<NetworkItem> ids, long index) {
+    public void receiveItems(ArrayList<NetworkItem> ids, int index) {
         if (index == 0) {
             receivedItems = new ArrayList<>();
         }
@@ -34,7 +34,7 @@ public void receiveItems(ArrayList<NetworkItem> ids, long index) {
                 item.itemName = dp.getItem(item.itemID);
                 item.locationName = dp.getLocation(item.locationID);
                 item.playerName = archipelagoClient.getRoomInfo().getPlayer(myTeam,item.playerID).alias;
-                archipelagoClient.getEventManager().callEvent(new ReceiveItemEvent(item));
+                archipelagoClient.getEventManager().callEvent(new ReceiveItemEvent(item, index));
             }
 
             this.index = receivedItems.size();

src/main/java/gg/archipelago/client/ItemManager.java

@@ -27,7 +27,7 @@ public BouncedEvent(HashSet<String> games, HashSet<String> tags, HashSet<Integer
     }
 
     public int getInt(String key) {
-        return (Integer) data.get(key);
+        return ((Double)data.get(key)).intValue();
     }
 
     public float getFloat(String key) {

src/main/java/gg/archipelago/client/events/BouncedEvent.java

@@ -5,8 +5,10 @@
 public class ReceiveItemEvent implements Event {
 
     private final NetworkItem item;
-    public ReceiveItemEvent(NetworkItem item) {
+    private final int index;
+    public ReceiveItemEvent(NetworkItem item, int index) {
         this.item = item;
+        this.index = index;
     }
 
     public NetworkItem getItem() {
@@ -36,4 +38,8 @@ public Long getLocationID() {
     public int getPlayerID() {
         return item.playerID;
     }
+
+    public long getIndex() {
+        return index;
+    }
 }

src/main/java/gg/archipelago/client/events/ReceiveItemEvent.java

@@ -7,6 +7,13 @@ public class APPacket {
 
     @Expose
     @SerializedName("cmd")
-    public APPacketType cmd;
+    private APPacketType cmd;
 
+    public APPacket(APPacketType cmd) {
+        this.cmd = cmd;
+    }
+
+    public APPacketType getCmd() {
+        return cmd;
+    }
 }

src/main/java/gg/archipelago/client/network/APPacket.java

@@ -27,8 +27,7 @@ public class BouncePacket extends APPacket implements Event {
     private HashMap<String, Object> data;
 
     public BouncePacket() {
-        super();
-        this.cmd = APPacketType.Bounce;
+        super(APPacketType.Bounce);
     }
 
     public HashMap<String, Object> getData() {

src/main/java/gg/archipelago/client/network/client/BouncePacket.java

@@ -31,7 +31,7 @@ public class ConnectPacket extends APPacket {
     public Set<String> tags;
 
     public ConnectPacket() {
-        cmd = APPacketType.Connect;
+        super(APPacketType.Connect);
     }
 
 }

src/main/java/gg/archipelago/client/network/client/ConnectPacket.java

@@ -14,7 +14,7 @@ public GetDataPackagePacket() {
     }
 
     public GetDataPackagePacket(Set<String> exclusions) {
-        cmd = APPacketType.GetDataPackage;
+        super(APPacketType.GetDataPackage);
         this.exclusions = exclusions;
     }
 }

src/main/java/gg/archipelago/client/network/client/GetDataPackagePacket.java

@@ -21,7 +21,7 @@ public class GetPacket extends APPacket {
 
 
     public GetPacket(Collection<String> keys) {
+        super(APPacketType.Get);
         this.keys = keys;
-        this.cmd = APPacketType.Get;
     }
 }

src/main/java/gg/archipelago/client/network/client/GetPacket.java

@@ -13,6 +13,6 @@ public class LocationChecks extends APPacket {
     public Set<Long> locations = new HashSet<>();
 
     public LocationChecks() {
-        this.cmd = APPacketType.LocationChecks;
+        super(APPacketType.LocationChecks);
     }
 }