Merge pull request #46 from Coflnet/fix/servercommands

initial fix, needs testing!

2 files changed, 18 insertions, 1 deletions

diff --git a/src/main/java/de/torui/coflsky/network/WSClient.java b/src/main/java/de/torui/coflsky/network/WSClient.java
index b5a94a5..353fab0 100644
--- a/src/main/java/de/torui/coflsky/network/WSClient.java
+++ b/src/main/java/de/torui/coflsky/network/WSClient.java
@@ -18,6 +18,7 @@ import de.torui.coflsky.CoflSky;
 import de.torui.coflsky.WSCommandHandler;
 import de.torui.coflsky.commands.Command;
 import de.torui.coflsky.commands.JsonStringCommand;
+import de.torui.coflsky.commands.RawCommand;
 
 public class WSClient extends WebSocketAdapter {
 
@@ -121,7 +122,15 @@ public class WSClient extends WebSocketAdapter {
 	}
 
 	public void SendCommand(Command cmd) {
-		String json = gson.toJson(cmd);
+		Send(cmd);
+	}
+
+	public void SendCommand(RawCommand cmd) {
+		Send(cmd);
+	}
+	
+	public void Send(Object obj) {
+		String json = gson.toJson(obj);
 		this.socket.sendText(json);
 	}
 		
diff --git a/src/main/java/de/torui/coflsky/network/WSClientWrapper.java b/src/main/java/de/torui/coflsky/network/WSClientWrapper.java
index 640d151..e6592bb 100644
--- a/src/main/java/de/torui/coflsky/network/WSClientWrapper.java
+++ b/src/main/java/de/torui/coflsky/network/WSClientWrapper.java
@@ -11,6 +11,7 @@ import com.neovisionaries.ws.client.WebSocketException;
 import de.torui.coflsky.CoflSky;
 import de.torui.coflsky.commands.Command;
 import de.torui.coflsky.commands.JsonStringCommand;
+import de.torui.coflsky.commands.RawCommand;
 import de.torui.coflsky.minecraft_integration.PlayerDataProvider;
 import net.minecraft.client.Minecraft;
 import net.minecraft.event.ClickEvent;
@@ -148,6 +149,13 @@ public class WSClientWrapper {
     	}
     }
     
+    public synchronized void SendMessage(RawCommand cmd){
+    	if(this.isRunning) {
+    		this.socket.SendCommand(cmd);
+    	} else {
+    		Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("tried sending a callback to coflnet but failed. the connection must be closed."));
+    	}
+    }
     public synchronized void SendMessage(Command cmd){
     	if(this.isRunning) {
     		this.socket.SendCommand(cmd);