+ 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

3 files changed, 15 insertions, 9 deletions

diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 0b51a67f12..231f68edf3 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -21,6 +21,7 @@ import miscutil.core.item.tool.misc.SandstoneHammer;
 import miscutil.core.item.tool.staballoy.StaballoyAxe;
 import miscutil.core.item.tool.staballoy.StaballoyPickaxe;
 import miscutil.core.lib.CORE;
+import miscutil.core.lib.CORE.configSwitches;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.Utils;
 import miscutil.core.util.debug.DEBUG_INIT;
@@ -112,7 +113,7 @@ public final class ModItems {
 	public static BaseItemHotFood itemHotFoodRaisinToast;
 	public static BaseItemFood itemFoodCurriedSausages;
 	public static BaseItemHotFood itemHotFoodCurriedSausages;
-	
+
 
 	//@SuppressWarnings("unused")
 	public static final void init(){
@@ -123,7 +124,7 @@ public final class ModItems {
 		if (CORE.DEBUG){
 			DEBUG_INIT.registerItems();
 		}		
-		
+
 		ItemsDusts.load();
 		ItemsIngots.load();
 		ItemsPlates.load();
@@ -251,6 +252,13 @@ public final class ModItems {
 		}
 
 
+		//Special Item Handling Case
+		if (configSwitches.enableAlternativeBatteryAlloy) {
+			ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141));
+			ModItems.itemPlateBatteryAlloy = new BaseItemPlate("itemPlateBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141));
+		}
+
+
 		//UtilsItems.generateSpawnEgg("ic2", "boatcarbon", Utils.generateSingularRandomHexValue(), Utils.generateSingularRandomHexValue());
 
 
@@ -264,11 +272,11 @@ public final class ModItems {
 		GameRegistry.registerItem(itemStaballoyPickaxe, itemStaballoyPickaxe.getUnlocalizedName());
 		itemStaballoyAxe = new StaballoyAxe("itemStaballoyAxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools);
 		GameRegistry.registerItem(itemStaballoyAxe, itemStaballoyAxe.getUnlocalizedName());
-		
+
 		//Sandstone Hammer
 		itemSandstoneHammer = new SandstoneHammer("itemSandstoneHammer").setCreativeTab(AddToCreativeTab.tabTools);
 		GameRegistry.registerItem(itemSandstoneHammer, itemSandstoneHammer.getUnlocalizedName());
-		
+
 		//Buffer Cores!
 		Item itemBufferCore;
 		for(int i=1; i<=10; i++){
@@ -277,7 +285,7 @@ public final class ModItems {
 			GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()+i);
 			//System.out.println("Buffer Core registration count is: "+i);
 		}
-		
+
 		itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
 		GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
 		GT_OreDictUnificator.registerOre("ingotRubber", UtilsItems.getItemStack(CORE.MODID+":itemStickyRubber", 1));
@@ -290,6 +298,6 @@ public final class ModItems {
 
 
 
-	
+
 	}
 }
\ No newline at end of file
diff --git a/src/Java/miscutil/core/item/init/ItemsIngots.java b/src/Java/miscutil/core/item/init/ItemsIngots.java
index 9afb364c44..981dfecf47 100644
--- a/src/Java/miscutil/core/item/init/ItemsIngots.java
+++ b/src/Java/miscutil/core/item/init/ItemsIngots.java
@@ -20,7 +20,6 @@ public class ItemsIngots {
 		ModItems.itemIngotTantalloy60 = new BaseItemIngot("itemIngotTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166));
 		ModItems.itemIngotTantalloy61 = new BaseItemIngot("itemIngotTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196));
 		ModItems.itemIngotBloodSteel = new BaseItemIngot("itemIngotBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0));
-		ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141));
 
 
 		//Hot Ingots
diff --git a/src/Java/miscutil/core/item/init/ItemsPlates.java b/src/Java/miscutil/core/item/init/ItemsPlates.java
index c92b77e506..878b6cbb4d 100644
--- a/src/Java/miscutil/core/item/init/ItemsPlates.java
+++ b/src/Java/miscutil/core/item/init/ItemsPlates.java
@@ -15,8 +15,7 @@ public class ItemsPlates {
 		ModItems.itemPlateStaballoy = new BaseItemPlate("itemPlateStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66));
 		ModItems.itemPlateBloodSteel = new BaseItemPlate("itemPlateBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0));		
 		ModItems.itemPlateTantalloy60 = new BaseItemPlate("itemPlateTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166));
-		ModItems.itemPlateTantalloy61 = new BaseItemPlate("itemPlateTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196));		
-		ModItems.itemPlateBatteryAlloy = new BaseItemPlate("itemPlateBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141));
+		ModItems.itemPlateTantalloy61 = new BaseItemPlate("itemPlateTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196));	
 		
 		
 	}