$ More work on Segment Analytics.

+ Added functions to identify myself as a player.
% Updated Segment 2.1.0 Bundled Library.

5 files changed, 39 insertions, 12 deletions

diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
index b2f3caec7d..c86b12b51b 100644
--- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
@@ -9,7 +9,6 @@ import static gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_Met
 import java.io.File;
 
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gtPlusPlus.core.lib.CORE.ConfigSwitches;
 import net.minecraftforge.common.config.Configuration;
 
 public class ConfigHandler {
@@ -19,7 +18,7 @@ public class ConfigHandler {
 				new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
 		config.load();
 	
-		ConfigSwitches.enableUpdateChecker = config.getBoolean("enableUpdateChecker", "debug", true,
+		enableUpdateChecker = config.getBoolean("enableUpdateChecker", "debug", true,
 				"Stops mod checking for updates.");
 	
 		// Debug
diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index 1876c1ef26..b8acf1a704 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -4,10 +4,13 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropFluoriteOre;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Random;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import gtPlusPlus.api.analytics.SegmentAnalytics;
+import gtPlusPlus.api.analytics.SegmentHelper;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
@@ -162,8 +165,12 @@ public class BlockEventHandler {
 		}
 		
 		//Try submit some data for this event.		
-		SegmentAnalytics.getAnalyticsForPlayer(event.harvester).submitTrackingData("Action_Block_Broken");
-				
+		//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);	
+		
+		
 		}
 		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 52e3845bde..33ee16a91a 100644
--- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java
@@ -5,11 +5,14 @@ import java.util.*;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
 import gtPlusPlus.api.analytics.SegmentAnalytics;
+import gtPlusPlus.api.analytics.SegmentHelper;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.proxy.ClientProxy;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.player.PlayerCache;
 import gtPlusPlus.core.util.player.PlayerUtils;
+import ic2.core.IC2;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 
@@ -32,14 +35,22 @@ public class LoginEventHandler {
 		}	
 
 		try {			
-			new SegmentAnalytics(event.player);			
+			//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);
+			
 		}
 		catch (Throwable t){
-			t.printStackTrace();
-			SegmentAnalytics.LOG("====================================================.");
 			SegmentAnalytics.LOG("Failed to create Analytics submission during log in process.");
-			SegmentAnalytics.LOG("Disabling.");
-			SegmentAnalytics.isEnabled = false;
 		}
 
 		try {
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 6efb7faaac..9c1133f1c9 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -11,7 +11,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import com.mojang.authlib.GameProfile;
 
 import gregtech.api.GregTech_API;
-import gtPlusPlus.api.analytics.SegmentAnalytics;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.geo.GeoUtils;
@@ -31,8 +30,6 @@ public class CORE {
 
 	//import cpw.mods.fml.common.Optional;
 
-
-
 	//Analytics handler
 	//public static SegmentAnalytics mAnalytics;
 
diff --git a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java
index e566a41849..82de626976 100644
--- a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java
+++ b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java
@@ -156,5 +156,18 @@ public class PlayerUtils {
 		}
 		return null;
 	}
+	
+	public static final boolean isPlayerAlkalus(){
+		return isPlayerAlkalus(Minecraft.getMinecraft().thePlayer);
+	}
+	
+	public static final boolean isPlayerAlkalus(EntityPlayer player){
+		if (player != null){
+			if (player.getDisplayName().toLowerCase().equals("draknyte1") || player.getDisplayName().toLowerCase().equals("alkalus")){
+				return true;
+			}
+		}
+		return false;
+	}
 
 }