Fixed issues in the dispatching and the Redemption event

Author: TheLimeGlass

.gradle/4.3/fileChanges/last-build.bin

@@ -1,2 +1,2 @@
-#Mon Sep 17 19:32:45 MDT 2018
-gradle.version=4.3
+#Thu Nov 01 01:23:25 MDT 2018
+gradle.version=4.10.2

.gradle/4.3/fileHashes/fileHashes.bin

@@ -47,5 +47,10 @@ public Instant getInstant() {
 	public String getType() {
 		return type;
 	}
+
+	@Override
+	public String getName() {
+		return "Activity";
+	}
 
 }

.gradle/4.3/fileHashes/fileHashes.lock

@@ -36,4 +36,9 @@ public String getMessage() {
 		return message;
 	}
 
+	@Override
+	public String getName() {
+		return "Authenticated";
+	}
+	
 }

.gradle/4.3/taskHistory/taskHistory.bin

@@ -10,4 +10,9 @@ public class ConnectEvent extends ElementsEvent {
 	 */
 	public ConnectEvent() {}
 
+	@Override
+	public String getName() {
+		return "Connect";
+	}
+	
 }

.gradle/4.3/taskHistory/taskHistory.lock

@@ -9,4 +9,9 @@ public class ConnectingEvent extends ElementsEvent {
 	 */
 	public ConnectingEvent() {}
 
+	@Override
+	public String getName() {
+		return "Connecting";
+	}
+	
 }

.gradle/buildOutputCleanup/buildOutputCleanup.lock

@@ -9,4 +9,9 @@ public class DisconnectEvent extends ElementsEvent {
 	 */
 	public DisconnectEvent() {}
 
+	@Override
+	public String getName() {
+		return "Disconnect";
+	}
+	
 }

.gradle/buildOutputCleanup/cache.properties

@@ -40,4 +40,9 @@ public boolean isCancelled() {
 		return cancelled;
 	}
 
+	@Override
+	public String getName() {
+		return "EmitterRegister: " + emitter.getEventName();
+	}
+	
 }

.gradle/buildOutputCleanup/outputFiles.bin

@@ -9,4 +9,9 @@ public class ReconnectEvent extends ElementsEvent {
 	 */
 	public ReconnectEvent() {}
 
+	@Override
+	public String getName() {
+		return "Reconnect";
+	}
+	
 }

src/main/java/me/limeglass/streamelements/api/events/ActivityEvent.java

@@ -30,7 +30,7 @@ public RedemptionEvent(String type, Instant instant, String provider, String cha
 	}
 
 	/**
-	 * @return The redeemer type of the redemption event.
+	 * @return The redeemer type of the redemption event. This is not the name of the Redeemed item!
 	 */
 	public String getRedeemerType() {
 		return redeemerType;

src/main/java/me/limeglass/streamelements/api/events/AuthenticatedEvent.java

@@ -2,12 +2,14 @@
 
 import io.socket.client.Socket;
 
-public class ElementsEvent {
+public abstract class ElementsEvent {
 
 	protected static Socket socket;
 
 	public static void setSocket(Socket s) {
 		socket = s;
 	}
 
+	public abstract String getName();
+	
 }

src/main/java/me/limeglass/streamelements/api/events/ConnectEvent.java

@@ -59,6 +59,7 @@ public static Class<?> registerListener(Class<?> clazz, Object listener) {
 	 * @return 
 	 */
 	public static ElementsEvent dispatch(ElementsEvent event) {
+		//TODO make this section cancellable
 		for (MethodHandler handler : registered) {
 			if (handler.accepts(event))
 				try {
@@ -93,7 +94,7 @@ public ElementsEvent handle(ElementsEvent event) throws Throwable {
 				throw new IllegalArgumentException("The listener instance may not be null and have a constructor at the same time.\n Use registerListener(Listener.class, new SubClassListener())");
 			if (listener == null)
 				listener = listenerClass.newInstance();
-			handle.invoke(listener, event);
+			handle.invoke(event);
 			return event;
 		};
 

src/main/java/me/limeglass/streamelements/api/events/ConnectingEvent.java

@@ -51,9 +51,9 @@ public void call(Socket socket, Object... args) {
 		instant = Instant.parse(object.getString("createdAt"));
 		channel = object.getString("channel");
 		if (object.has("type") && object.getString("type").equalsIgnoreCase(type))
-			call(socket, object.getJSONObject("data"));
+			this.call(socket, object.getJSONObject("data"));
 		else if (object.has("redeemerType") && type.equalsIgnoreCase("redemption"))
-			call(socket, object);
+			this.call(socket, object);
 	}
 
 	protected abstract void call(Socket socket, JSONObject data);

src/main/java/me/limeglass/streamelements/api/events/DisconnectEvent.java

@@ -59,7 +59,7 @@ protected void call(Socket socket, JSONObject data) {
 		JSONObject alert = item.getJSONObject("alert");
 		int duration = alert.getJSONObject("graphics").getInt("duration");
 		JSONObject audio = alert.getJSONObject("audio");
-		Number volume = audio.getNumber("volume");
+		Number volume = audio.getInt("volume");
 		String src = audio.getString("src");
 		boolean enabled = alert.getBoolean("enabled");
 		EventAlert eventAlert = new EventAlert(duration, volume, src, enabled);