From 70fb3475418db0048c39db1479b62a92be041314 Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Wed, 27 Jul 2016 11:05:53 +1000
Subject: + Updated Tooltips on all GT5u related blocks. + Added Config options
 for TC Shard OreDicting, IC2 Recipe Removal and Alternative battery Alloy. $
 Fixed the Industrial Centrifuge not handling recipes properly. $ Fixed the
 Industrial Centrifuge stopping when it's recipe time was < 1. % Moved Config
 related variables to their own inner class within CORE.java

---
 src/Java/miscutil/core/lib/CORE.java       | 24 ++++++++++++++++++------
 src/Java/miscutil/core/lib/LoadedMods.java |  3 ++-
 2 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'src/Java/miscutil/core/lib')

diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 425f51be5d..702e5e00f3 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -9,6 +9,7 @@ import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import miscutil.core.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
 import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.config.Configuration;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -33,12 +34,8 @@ public class CORE {
 	public static List<Runnable> GT_BlockIconload = new ArrayList<Runnable>();
 	public static final Class<AddToCreativeTab> TAB = AddToCreativeTab.class;
 	public static Configuration Config;
-
-	public static boolean disableEnderIOIntegration = false;
-	public static boolean disableStaballoyBlastFurnaceRecipe = false;
-	public static boolean disableCentrifugeFormation = true;
-	public static boolean enableSolarGenerators = false;
-
+	public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]";
+	
 	/**
 	 * A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items.
 	 */
@@ -72,4 +69,19 @@ public class CORE {
 
 	//public static final Materials2[] MiscGeneratedMaterials = new Materials2[1000];
 
+	public static class configSwitches {
+
+		//Debug
+		public static boolean disableEnderIOIntegration = false;
+		public static boolean disableStaballoyBlastFurnaceRecipe = false;
+		public static boolean disableCentrifugeFormation = true;
+		
+		//Machine Related
+		public static boolean enableSolarGenerators = false;
+		public static boolean enableAlternativeBatteryAlloy = false;
+		public static boolean enableThaumcraftShardUnification = false;
+		public static boolean disableIC2Recipes = false;		
+		
+	}
+	
 }
diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java
index 86cc8e94a9..6b25b197fe 100644
--- a/src/Java/miscutil/core/lib/LoadedMods.java
+++ b/src/Java/miscutil/core/lib/LoadedMods.java
@@ -1,5 +1,6 @@
 package miscutil.core.lib;
 
+import miscutil.core.lib.CORE.configSwitches;
 import miscutil.core.util.Utils;
 import miscutil.core.xmod.gregtech.api.enums.GregtechTextures;
 import miscutil.core.xmod.gregtech.recipes.GregtechRecipeAdder;
@@ -53,7 +54,7 @@ public class LoadedMods {
 			
 			totalMods++;
 		}
-		if (Loader.isModLoaded("EnderIO") == true && !CORE.disableEnderIOIntegration){
+		if (Loader.isModLoaded("EnderIO") == true && !configSwitches.disableEnderIOIntegration){
 			EnderIO = true;
 			Utils.LOG_INFO("Components enabled for: EnderIO");
 			totalMods++;
-- 
cgit