Implements #6

2 files changed, 18 insertions, 0 deletions

diff --git a/src/main/java/de/torui/coflsky/websocket/WSClient.java b/src/main/java/de/torui/coflsky/websocket/WSClient.java
index 7fb8e34..c4ad799 100644
--- a/src/main/java/de/torui/coflsky/websocket/WSClient.java
+++ b/src/main/java/de/torui/coflsky/websocket/WSClient.java
@@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft;
 
 import de.torui.coflsky.WSCommandHandler;
 import de.torui.coflsky.core.Command;
+import de.torui.coflsky.core.StringCommand;
 
 public class WSClient extends WebSocketAdapter {
 
@@ -37,6 +38,7 @@ public class WSClient extends WebSocketAdapter {
 	}
 	public URI uri;
 	public WebSocket socket;
+	public WebSocketState currentState = WebSocketState.CLOSED;
 	
 	public WSClient(URI uri) {
 		this.uri = uri;
@@ -92,6 +94,7 @@ public class WSClient extends WebSocketAdapter {
 	@Override
 	public void onStateChanged(WebSocket websocket, WebSocketState newState) throws Exception {
 		System.out.println("WebSocket Changed state to: " + newState);
+		currentState = newState;
 		super.onStateChanged(websocket, newState);
 	}
 
@@ -113,6 +116,11 @@ public class WSClient extends WebSocketAdapter {
 		this.socket.sendText(json);
 	}
 
+	public void SendCommand(StringCommand sc) {
+		String json = gson.toJson(sc);
+		this.socket.sendText(json);
+	}
+
 		
 	
 	
diff --git a/src/main/java/de/torui/coflsky/websocket/WSClientWrapper.java b/src/main/java/de/torui/coflsky/websocket/WSClientWrapper.java
index 96a2729..2cdfda1 100644
--- a/src/main/java/de/torui/coflsky/websocket/WSClientWrapper.java
+++ b/src/main/java/de/torui/coflsky/websocket/WSClientWrapper.java
@@ -10,6 +10,7 @@ import com.neovisionaries.ws.client.WebSocketException;
 
 import de.torui.coflsky.CoflSky;
 import de.torui.coflsky.core.Command;
+import de.torui.coflsky.core.StringCommand;
 
 
 public class WSClientWrapper {
@@ -67,4 +68,13 @@ public class WSClientWrapper {
     public synchronized void SendMessage(Command cmd){
     	this.socket.SendCommand(cmd);
     }
+
+	public void SendMessage(StringCommand sc) {
+		this.socket.SendCommand(sc);
+	}
+	
+	public String GetStatus() {
+		return "" + isRunning + " " +  
+	    (this.socket!=null ? this.socket.currentState.toString() : "NOT_INITIALIZED");
+	}
 }