From e62c421374b8d68f29e72b60efcb24f6b486acfa Mon Sep 17 00:00:00 2001
From: Lizbeth Rika <vazkii@hotmail.com>
Date: Mon, 18 May 2015 14:48:29 +0100
Subject: [PATCH] Fixed SoundLogic's mess.

---
 .../java/vazkii/botania/common/Botania.java     | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java
index de962f836..afeadb9da 100644
--- a/src/main/java/vazkii/botania/common/Botania.java
+++ b/src/main/java/vazkii/botania/common/Botania.java
@@ -37,7 +37,8 @@ public class Botania {
 	public static boolean thaumcraftLoaded = false;
 	public static boolean bcTriggersLoaded = false;
 	public static boolean bloodMagicLoaded = false;
-	
+	public static boolean coloredLightsLoaded = false;
+
 	public static ILightHelper lightHelper;
 
 	@Instance(LibMisc.MOD_ID)
@@ -51,20 +52,12 @@ public class Botania {
 		thaumcraftLoaded = Loader.isModLoaded("Thaumcraft");
 		bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements");
 		bloodMagicLoaded = Loader.isModLoaded("AWWayofTime"); // Psh, noob
-		
-		if(lightHelper == null)
-			lightHelper = new LightHelperVanilla();
+		coloredLightsLoaded = Loader.isModLoaded("easycoloredlights");
+		 
+		lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla();
 
 		proxy.preInit(event);
 	}
-
-	@EventHandler
-	@Optional.Method(modid = "easycoloredlights")
-	public void preInitColoredLights(FMLPreInitializationEvent event) {
-		System.out.println("easycolor!");
-		lightHelper = new LightHelperColored();
-	}
-	
 	@EventHandler
 	public void init(FMLInitializationEvent event) {
 		proxy.init(event);