add invalid packet event.

add getValueAsObject to SetReplyEvent

Author: KonoTyran

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

@@ -359,7 +359,7 @@ public int dataStorageSet(SetPacket setPacket) {
      *
      * @param keys List of Keys to be notified of.
      */
-    public void dataStorageSetNotify(ArrayList<String> keys) {
+    public void dataStorageSetNotify(Collection<String> keys) {
         if (archipelagoWebSocket == null || !archipelagoWebSocket.isAuthenticated())
             return;
         archipelagoWebSocket.sendPacket(new SetNotifyPacket(keys));

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

@@ -9,7 +9,6 @@
 import gg.archipelago.client.events.*;
 import gg.archipelago.client.helper.DeathLink;
 import gg.archipelago.client.network.APPacket;
-import gg.archipelago.client.network.APPacketType;
 import gg.archipelago.client.network.ConnectionResult;
 import gg.archipelago.client.network.client.ConnectPacket;
 import gg.archipelago.client.network.client.GetDataPackagePacket;
@@ -191,12 +190,17 @@ public void onMessage(String message) {
                         break;
                     case Retrieved:
                         RetrievedPacket retrievedPacket = gson.fromJson(packet, RetrievedPacket.class);
-                        archipelagoClient.getEventManager().callEvent(new RetrievedEvent(retrievedPacket.keys, retrievedPacket.requestID));
+                        archipelagoClient.getEventManager().callEvent(new RetrievedEvent(retrievedPacket.keys, packet.getAsJsonObject().get("keys").getAsJsonObject(), retrievedPacket.requestID));
                         break;
                     case SetReply:
                         SetReplyPacket setReplyPacket = gson.fromJson(packet, SetReplyPacket.class);
                         archipelagoClient.getEventManager().callEvent(new SetReplyEvent(setReplyPacket.key, setReplyPacket.value, setReplyPacket.original_Value, packet.getAsJsonObject().get("value"), setReplyPacket.requestID));
                         break;
+                    case InvalidPacket:
+                        InvalidPacket invalidPacket = gson.fromJson(packet, InvalidPacket.class);
+                        archipelagoClient.getEventManager().callEvent(new InvalidPacketEvent(invalidPacket.type, invalidPacket.Original_cmd, invalidPacket.text));
+                    default:
+
                 }
             }
         } catch (Exception e) {

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

@@ -0,0 +1,31 @@
+package gg.archipelago.client.events;
+
+public class InvalidPacketEvent implements Event {
+
+    private final String type;
+    private final String originalCommand;
+    private final String text;
+
+    public InvalidPacketEvent(String type, String originalCommand, String text) {
+        this.type = type;
+        this.text = text;
+        this.originalCommand = originalCommand;
+    }
+
+
+    public String getType() {
+        return type;
+    }
+
+    public String getOriginalCommand() {
+        return originalCommand;
+    }
+
+    public boolean hasOriginalCommand() {
+        return originalCommand != null;
+    }
+
+    public String getText() {
+        return text;
+    }
+}

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

@@ -1,13 +1,22 @@
 package gg.archipelago.client.events;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.internal.Primitives;
+import com.google.gson.internal.bind.JsonTreeReader;
+
+import java.lang.reflect.Type;
 import java.util.HashMap;
 
 public class RetrievedEvent implements Event {
 
     public HashMap<String, Object> data;
     private final int requestID;
-    public RetrievedEvent(HashMap<String, Object> keys , int requestID) {
+    private final JsonObject jsonValue;
+
+    public RetrievedEvent(HashMap<String, Object> keys, JsonObject jsonValue, int requestID) {
         data = keys;
+        this.jsonValue = jsonValue;
         this.requestID = requestID;
     }
 
@@ -24,11 +33,11 @@ public double getDouble(String key) {
     }
 
     public String getString(String key) {
-        return (String)data.get(key);
+        return (String) data.get(key);
     }
 
     public boolean getBoolean(String key) {
-        return (boolean)data.get(key);
+        return (boolean) data.get(key);
     }
 
     public Object getObject(String key) {
@@ -39,6 +48,15 @@ public boolean containsKey(String key) {
         return data.containsKey(key);
     }
 
+    public <T> T getValueAsObject(String key, Class<T> classOfT) {
+        Object value = new Gson().fromJson(jsonValue.get(key), classOfT);
+        return Primitives.wrap(classOfT).cast(value);
+    }
+
+    public <T> T getValueAsObject(String key, Type typeOfT) {
+        return jsonValue == null ? null : new Gson().fromJson(new JsonTreeReader(jsonValue.get(key)), typeOfT);
+    }
+
     public int getRequestID() {
         return requestID;
     }

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

@@ -4,6 +4,9 @@
 import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.internal.Primitives;
+import com.google.gson.internal.bind.JsonTreeReader;
+
+import java.lang.reflect.Type;
 
 public class SetReplyEvent implements Event {
     @SerializedName("key")
@@ -18,18 +21,22 @@ public class SetReplyEvent implements Event {
     private final JsonElement jsonValue;
 
     public SetReplyEvent(String key, Object value, Object original_value, JsonElement jsonValue, int requestID) {
-        this.key=key;
-        this.value=value;
-        this.original_value=original_value;
+        this.key = key;
+        this.value = value;
+        this.original_value = original_value;
         this.jsonValue = jsonValue;
         this.requestID = requestID;
     }
 
     public <T> T getValueAsObject(Class<T> classOfT) {
-        Object value = new Gson().fromJson(jsonValue,classOfT);
+        Object value = new Gson().fromJson(jsonValue, classOfT);
         return Primitives.wrap(classOfT).cast(value);
     }
 
+    public <T> T getValueAsObject(Type typeOfT) {
+        return jsonValue == null ? null : new Gson().fromJson(new JsonTreeReader(jsonValue), typeOfT);
+    }
+
     public int getRequestID() {
         return requestID;
     }

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

@@ -50,5 +50,7 @@ public enum APPacketType {
     @SerializedName("Retrieved")
     Retrieved,
     @SerializedName("SetReply")
-    SetReply
+    SetReply,
+    @SerializedName("InvalidPacket")
+    InvalidPacket
 }

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

@@ -3,15 +3,16 @@
 import gg.archipelago.client.network.APPacket;
 import gg.archipelago.client.network.APPacketType;
 
-import java.util.ArrayList;
+import java.util.Collection;
 
 public class SetNotifyPacket extends APPacket {
 
     /**
      * a list of datastorage keys to be notified upon their change.
      */
-    public ArrayList<String> keys;
-    public SetNotifyPacket(ArrayList<String> keys) {
+    public Collection<String> keys;
+
+    public SetNotifyPacket(Collection<String> keys) {
         super(APPacketType.SetNotify);
         this.keys = keys;
     }

src/main/java/gg/archipelago/client/network/server/InvalidPacket.java

@@ -0,0 +1,19 @@
+package gg.archipelago.client.network.server;
+
+import com.google.gson.annotations.SerializedName;
+import gg.archipelago.client.network.APPacket;
+import gg.archipelago.client.network.APPacketType;
+
+public class InvalidPacket extends APPacket {
+
+    @SerializedName("type")
+    public String type;
+    @SerializedName("original_cmd")
+    public String Original_cmd;
+    @SerializedName("text")
+    public String text;
+
+    public InvalidPacket() {
+        super(APPacketType.InvalidPacket);
+    }
+}