Fixed server from crashing

Author: Tamas Henning

src/java/com/tamashenning/forgeanalytics/AnalyticsClient.java

@@ -24,21 +24,28 @@
 
 public class AnalyticsClient {
 
-	public boolean UploadModel(AnalyticsModel model) throws Exception {
+	public boolean UploadModel(AnalyticsModel model, boolean isClient) throws Exception {
 
 		model.Properties.putAll(ForgeAnalyticsConstants.CustomProperties);
 
 		Gson g = new Gson();
 		String json = g.toJson(model);
 
-		return this.UploadModel(json);
+		return this.UploadModel(json, isClient);
 	}
 
-	private boolean UploadModel(String json) throws Exception {
+	private boolean UploadModel(String json, boolean isClient) throws Exception {
 
-		// Respect snooper settings...
-		if (!Minecraft.getMinecraft().isSnooperEnabled()) {
-			return false;
+		if (isClient) {
+			// Respect snooper settings...
+			if (!Minecraft.getMinecraft().isSnooperEnabled()) {
+				return false;
+			}
+		} else {
+			// Respect snooper settings...
+			if (!MinecraftServer.getServer().isSnooperEnabled()) {
+				return false;
+			}
 		}
 
 		System.out.println(json);

src/java/com/tamashenning/forgeanalytics/ForgeAnalyticsMod.java

@@ -49,7 +49,7 @@ public void serverLoad(FMLServerStartingEvent e) {
 	public void serverStarted(FMLServerStartedEvent e) {
 		AnalyticsClient ac = new AnalyticsClient();
 		try {
-			ac.UploadModel(ac.CreateServerStartupPing());
+			ac.UploadModel(ac.CreateServerStartupPing(), false);
 		} catch (Exception e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
@@ -60,19 +60,7 @@ public void serverStarted(FMLServerStartedEvent e) {
 	public void serverStopped(FMLServerStoppedEvent e) {
 		AnalyticsClient ac = new AnalyticsClient();
 		try {
-			ac.UploadModel(ac.CreateServerStoppedPing());
-		} catch (Exception e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-	}
-
-	@SideOnly(Side.CLIENT)
-	@EventHandler
-	public void fmlLoaded(FMLLoadCompleteEvent e) {
-		AnalyticsClient ac = new AnalyticsClient();
-		try {
-			ac.UploadModel(ac.CreateClientStartupPing());
+			ac.UploadModel(ac.CreateServerStoppedPing(), false);
 		} catch (Exception e1) {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();

src/java/com/tamashenning/forgeanalytics/client/ForgeAnalyticsSingleton.java

@@ -39,19 +39,19 @@ public String CreateID() {
 		return id;
 	}
 
-	public void StartKeepAliveTimer() {
+	public void StartKeepAliveTimer(final boolean isClient) {
 		Timer timer = new Timer();
 		timer.scheduleAtFixedRate(new TimerTask() {
 			@Override
 			public void run() {
 				try {
 					// I'm running locally with no world loaded yet...
 					if (Minecraft.getMinecraft().theWorld == null) {
-						ac.UploadModel(ac.CreateClientKeepAlivePing());
+						ac.UploadModel(ac.CreateClientKeepAlivePing(), isClient);
 					} else if (!Minecraft.getMinecraft().theWorld.isRemote) {
-						ac.UploadModel(ac.CreateClientKeepAlivePing());
+						ac.UploadModel(ac.CreateClientKeepAlivePing(), isClient);
 					} else {
-						ac.UploadModel(ac.CreateServerKeepAlivePing());
+						ac.UploadModel(ac.CreateServerKeepAlivePing(), isClient);
 					}
 				} catch (Exception e) {
 					//
@@ -61,5 +61,4 @@ public void run() {
 			}
 		}, ForgeAnalyticsConstants.KEEPALIVETIME, ForgeAnalyticsConstants.KEEPALIVETIME);
 	}
-
 }

src/java/com/tamashenning/forgeanalytics/proxies/ClientProxy.java

@@ -1,5 +1,8 @@
 package com.tamashenning.forgeanalytics.proxies;
 
+import com.tamashenning.forgeanalytics.AnalyticsClient;
+import com.tamashenning.forgeanalytics.client.ForgeAnalyticsSingleton;
+
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -18,5 +21,16 @@ public void init(FMLInitializationEvent e) {
 	@Override
 	public void postInit(FMLPostInitializationEvent e) {
 		super.postInit(e);
+		
+		AnalyticsClient ac = new AnalyticsClient();
+		try {
+			ac.UploadModel(ac.CreateClientStartupPing(), true);
+		} catch (Exception e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+
+		ForgeAnalyticsSingleton.getInstance().StartKeepAliveTimer(true);
+
 	}
 }

src/java/com/tamashenning/forgeanalytics/proxies/CommonProxy.java

@@ -54,6 +54,6 @@ public void init(FMLInitializationEvent e) {
 	}
 
 	public void postInit(FMLPostInitializationEvent e) {
-		ForgeAnalyticsSingleton.getInstance().StartKeepAliveTimer();
+		
 	}
 }

src/java/com/tamashenning/forgeanalytics/proxies/ServerProxy.java

@@ -1,5 +1,8 @@
 package com.tamashenning.forgeanalytics.proxies;
 
+import com.tamashenning.forgeanalytics.AnalyticsClient;
+import com.tamashenning.forgeanalytics.client.ForgeAnalyticsSingleton;
+
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -18,6 +21,17 @@ public void init(FMLInitializationEvent e) {
 	@Override
 	public void postInit(FMLPostInitializationEvent e) {
 		super.postInit(e);
+		
+		AnalyticsClient ac = new AnalyticsClient();
+		try {
+			ac.UploadModel(ac.CreateClientStartupPing(), false);
+		} catch (Exception e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+
+		ForgeAnalyticsSingleton.getInstance().StartKeepAliveTimer(false);
+
 	}
 
 }