implements #11, #8

1 files changed, 15 insertions, 44 deletions

diff --git a/src/main/java/de/torui/coflsky/CoflSky.java b/src/main/java/de/torui/coflsky/CoflSky.java
index cc762ca..85d05b6 100644
--- a/src/main/java/de/torui/coflsky/CoflSky.java
+++ b/src/main/java/de/torui/coflsky/CoflSky.java
@@ -1,13 +1,12 @@
 package de.torui.coflsky;
 
-import java.io.IOException;
+
 import java.net.URISyntaxException;
-import java.util.UUID;
+
 
 import org.lwjgl.input.Keyboard;
 
-import de.torui.coflsky.minecraft_integration.PlayerDataProvider;
-import de.torui.coflsky.minecraft_integration.TemporarySession;
+
 import de.torui.coflsky.websocket.WSClientWrapper;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraftforge.client.ClientCommandHandler;
@@ -27,46 +26,26 @@ public class CoflSky
     public static WSClientWrapper Wrapper;
     public static KeyBinding[] keyBindings;
 
-
+    
+    public static final String[] webSocketURIPrefix = new String [] {
+        	"wss://sky-commands.coflnet.com/modsocket",
+            "wss://sky-mod.coflnet.com/modsocket",
+        	"ws://sky-commands.coflnet.com/modsocket",
+        	"ws://sky-mod.coflnet.com/modsocket",
+    };
+    
+    public static String CommandUri = "https://sky-commands.coflnet.com/api/mod/commands";
     
     @EventHandler
     public void init(FMLInitializationEvent event) throws URISyntaxException
     {
     	
-    	System.out.println(">>>> "+ TemporarySession.GetTempFileFolder().toString());
-    	//Minecraft.getSessionInfo().forEach((a,b) -> System.out.println("Key=" + a + " value=" + b));
-    	
-    	//System.out.println("Loggerfactory: " + LoggerFactory.getILoggerFactory());
-    //	Logger log = LoggerFactory.getLogger(CoflSky.class);
-   // 	log.debug("Testing");
-    	
-    	  
-    	
-		// some example code
-        System.out.println("Initializing");
-        
-        //new Thread(new WSClient(new URI("ws://localhost:8080"))).start();        
-        System.out.println(">>>Started");
-        
-        String username = PlayerDataProvider.getUsername();
-        String uuid = PlayerDataProvider.getActivePlayerUUID();
-        System.out.println(">>> Username= " + username + " with UUID=" + uuid ); 
-        
-        String tempUUID = UUID.randomUUID().toString();
-        try {
-			TemporarySession.UpdateSessions();
-			tempUUID = TemporarySession.GetSession(username).SessionUUID;
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		System.out.println(">>>Started");
         
-        
-        //CoflSky.Wrapper = new WSClientWrapper("wss://sky-commands.coflnet.com/modsocket?version=" + CoflSky.VERSION  + "&uuid=");
-        CoflSky.Wrapper = new WSClientWrapper("ws://sky-mod.coflnet.com/modsocket?version=" + CoflSky.VERSION + "&SId=" + tempUUID  + "&uuid=" + uuid);
+        CoflSky.Wrapper = new WSClientWrapper(webSocketURIPrefix);
         
         keyBindings = new KeyBinding[] {
-        		new KeyBinding("key.replay_last.onclick", Keyboard.KEY_R, "SkyCofl")
+        		new KeyBinding("key.replay_last.onclick", Keyboard.KEY_R, "SkyCofl"),
         };
         
         if(event.getSide() == Side.CLIENT) {
@@ -82,14 +61,6 @@ public class CoflSky
         MinecraftForge.EVENT_BUS.register(new EventRegistry());	   
     }   
 
-
-   /* @EventHandler
-    public void init(FMLServerStartingEvent event)
-    {
-    	
-    	if(event.getSide() == Side.CLIENT)    	return;
-    		//event.registerServerCommand(new CoflSkyCommand());
-    }*/
     
 }
 	
\ No newline at end of file