3 files changed, 4 insertions, 20 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index b8acf1a704..93786b1b3f 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -165,12 +165,8 @@ public class BlockEventHandler {
 		}
 		
 		//Try submit some data for this event.		
-		//SegmentAnalytics.getAnalyticsForPlayer(event.harvester).submitTrackingData("Action_Block_Broken", event.block.getLocalizedName());
-		Map<String, Object> properties = new LinkedHashMap<>();
-		properties.put("blockType", event.block.getLocalizedName());
-		SegmentHelper.getInstance().trackUser(event.harvester.getUniqueID().toString(), "Action_Block_Broken", properties);	
-		
-		
+		SegmentAnalytics.getAnalyticsForPlayer(event.harvester).submitTrackingData("Action_Block_Broken", event.block.getLocalizedName());
+				
 		}
 		catch (Throwable r){
 			Utils.LOG_INFO("Block Event Handler Failed. Please Report this to Alkalus.");
diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
index 33ee16a91a..7629c98eb4 100644
--- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
@@ -35,19 +35,7 @@ public class LoginEventHandler {
 		}	
 
 		try {			
-			//new SegmentAnalytics(event.player);	
-			
-			
-			Map<String, Object> properties = new LinkedHashMap<>();
-			properties.put("username", this.localPlayersName);
-			properties.put("gt_version", Utils.getGregtechVersionAsString());
-			if (LoadedMods.IndustrialCraft2){
-				properties.put("ic2_version", IC2.VERSION);
-			}
-			properties.put("country_code", CORE.USER_COUNTRY);
-			properties.put("gtnh", CORE.GTNH);			
-			SegmentHelper.getInstance().addUser(this.localPlayersUUID.toString(), properties);
-			
+			new SegmentAnalytics(event.player);			
 		}
 		catch (Throwable t){
 			SegmentAnalytics.LOG("Failed to create Analytics submission during log in process.");
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 9c1133f1c9..9b14e38527 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -31,7 +31,7 @@ public class CORE {
 	//import cpw.mods.fml.common.Optional;
 
 	//Analytics handler
-	//public static SegmentAnalytics mAnalytics;
+	//public static SegmentAnalytics mHelper;
 
 	public static Map PlayerCache;