Merge pull request #5 from alkcorp/master

sync fork

25 files changed, 1412 insertions, 728 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index de22821127..8bfcfe2d70 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -288,6 +288,10 @@ public final class ModItems {
 	public static Item itemAirFilter;
 
 	public static Item itemCoalCoke;
+	public static Item itemCactusCharcoal;
+	public static Item itemSugarCharcoal;
+	public static Item itemCactusCoke;
+	public static Item itemSugarCoke;
 
 	public static Item itemCircuitLFTR;
 
@@ -394,11 +398,8 @@ public final class ModItems {
 		//Some Simple forms of materials
 		itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
 		GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
-		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemStickyRubber", 1));
-
-
-		itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "fuelCoke", 3200, 0).setTextureName(CORE.MODID + ":itemCoalCoke");
-
+		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemStickyRubber", 1));		
+		
 		//Register Hydrogen Blobs first, so we can replace old helium blobs.
 		itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
 		//Register Old Helium Blob, this will be replaced when held by a player.
@@ -564,9 +565,9 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE);
 
 			//LFTR Fuel components
-			MaterialGenerator.generate(FLUORIDES.HYDROXIDE); //LFTR fuel component
-			MaterialGenerator.generate(FLUORIDES.AMMONIA); //LFTR fuel component
-			MaterialGenerator.generate(FLUORIDES.AMMONIUM); //LFTR fuel component
+			MaterialGenerator.generate(MISC_MATERIALS.HYDROXIDE); //LFTR fuel component
+			MaterialGenerator.generate(MISC_MATERIALS.AMMONIA); //LFTR fuel component
+			MaterialGenerator.generate(MISC_MATERIALS.AMMONIUM); //LFTR fuel component
 			MaterialGenerator.generate(FLUORIDES.AMMONIUM_BIFLUORIDE); //LFTR fuel component
 			MaterialGenerator.generate(FLUORIDES.BERYLLIUM_HYDROXIDE); //LFTR fuel component
 			MaterialGenerator.generate(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); //LFTR fuel component
@@ -1054,10 +1055,10 @@ public final class ModItems {
 			GT_OreDictUnificator.registerOre("platePhasedIron", ItemUtils.getSimpleStack(itemPlatePulsatingIron));
 			GT_OreDictUnificator.registerOre("blockVibrantAlloy", ItemUtils.getItemStackOfAmountFromOreDict("blockPhasedGold", 1));			
 
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 10000, 16, 4*9);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 10000, 16, 4*9);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(16), 10000, 16, 4);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(1294), 10000, 16, 4*9*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), MaterialEIO.REDSTONE_ALLOY.getFluid(16), 16, 4);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), MaterialEIO.REDSTONE_ALLOY.getFluid(1294), 16, 4*9*9);
 			
 		}
 		else {
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 90e831cbb4..9b732e38e1 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -96,7 +96,7 @@ public class BaseItemComponent extends Item{
 		this.extraData = RGBA;
 		this.setTextureName(CORE.MODID + ":" + "item"+ComponentTypes.CELL.COMPONENT_NAME);
 		GameRegistry.registerItem(this, aFormattedNameForFluids);
-		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+aFormattedNameForFluids, ItemUtils.getSimpleStack(this));
+		GT_OreDictUnificator.registerOre(ComponentTypes.CELL.getOreDictName()+Utils.sanitizeStringKeepBrackets(localName), ItemUtils.getSimpleStack(this));
 		registerComponent();
 	}
 
@@ -165,13 +165,32 @@ public class BaseItemComponent extends Item{
 	public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 
 		try {
+			
+
+			if (this.componentMaterial == null){
+				if (this.materialName != null){
+					//list.add(Utils.sanitizeStringKeepBrackets(materialName));					
+				}				
+			}			
+			
 			if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("") && (this.componentMaterial != null)){
 
 
 				if (this.componentMaterial != null){
-					if ((!this.componentMaterial.vChemicalFormula.equals("??")) && (!this.componentMaterial.vChemicalFormula.equals("?")) && (this.componentMaterial.getState() != MaterialState.PURE_LIQUID)) {
+					if (!this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
 						list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula));
 					}
+					else if (this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+						String temp = componentMaterial.vChemicalFormula;
+						temp = temp.replace(" ", "");
+						temp = temp.replace("-", "");
+						temp = temp.replace("_", "");
+						temp = temp.replace("!", "");
+						temp = temp.replace("@", "");
+						temp = temp.replace("#", "");
+						temp = temp.replace(" ", "");				
+						list.add(temp);
+					}
 
 					if (this.componentMaterial.isRadioactive){
 						list.add(CORE.GT_Tooltip_Radioactive);
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index afc4b17354..9022f864cb 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -1,14 +1,10 @@
 package gtPlusPlus.core.item.base.dusts;
 
 import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 
 public class BaseItemDust extends BaseItemComponent {
 
-
-
-	private Material dustInfo;
 	private BaseItemComponent[] mSizedDusts = new BaseItemComponent[2];
 
 	public BaseItemDust(Material aMat) {
@@ -33,127 +29,10 @@ public class BaseItemDust extends BaseItemComponent {
 		}
 	}
 
-	private BaseItemDust(final String unlocalizedName, final String materialName, final Material matInfo, final int colour, final String pileSize, final int tier){
-		this(unlocalizedName, materialName, matInfo, colour, pileSize, tier, true);
-	}
-
 	private BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize, int tier, boolean addRecipes) {
 		super(matInfo, ComponentTypes.DUST);
-
-		try {/*
-			this.setUnlocalizedName(unlocalizedName);
-			this.setMaxStackSize(64);
-
-			this.setCreativeTab(tabMisc);
-			this.colour = colour;
-			this.mTier = tier;
-			this.materialName = materialName;
-			this.dustInfo = matInfo;
-			this.setTextureName(this.getCorrectTexture(pileSize));
-			GameRegistry.registerItem(this, unlocalizedName);
-
-			String temp = "";
-			Logger.WARNING("Unlocalized name for OreDict nameGen: "+this.getUnlocalizedName());
-			if (this.getUnlocalizedName().contains("item.")){
-				temp = this.getUnlocalizedName().replace("item.", "");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			else {
-				temp = this.getUnlocalizedName();
-			}
-			if (temp.contains("DustTiny")){
-				temp = temp.replace("itemD", "d");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			else if (temp.contains("DustSmall")){
-				temp = temp.replace("itemD", "d");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			else {
-				temp = temp.replace("itemD", "d");
-				Logger.WARNING("Generating OreDict Name: "+temp);
-			}
-			if ((temp != null) && !temp.equals("")){
-				GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this));
-			}
-			if (addRecipes){
-				this.addFurnaceRecipe();
-				this.addMacerationRecipe();
-			}		
-		 */}
-		catch (Throwable t) {
-			t.printStackTrace();
-		}
 	}
 
-	private String getCorrectTexture(final String pileSize){
-
-		if (!CORE.ConfigSwitches.useGregtechTextures || this.dustInfo.getTextureSet() == null){
-			if ((pileSize == "dust") || (pileSize == "Dust")){
-				this.setTextureName(CORE.MODID + ":" + "dust");}
-			else{
-				this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);
-			}
-		}
-
-
-		if (pileSize.toLowerCase().contains("small")){
-			return "gregtech" + ":" + "materialicons/"+this.dustInfo.getTextureSet().mSetName+"/dustSmall";
-		}
-		else if (pileSize.toLowerCase().contains("tiny")){
-			return "gregtech" + ":" + "materialicons/"+this.dustInfo.getTextureSet().mSetName+"/dustTiny";
-		}
-		return "gregtech" + ":" + "materialicons/"+this.dustInfo.getTextureSet().mSetName+"/dust";
-	}
-
-	/*	@Override
-	public String getItemStackDisplayName(final ItemStack iStack) {
-
-		String unlocal = super.getItemStackDisplayName(iStack);
-		if (!unlocal.toLowerCase().contains(".name")) {
-			return unlocal;
-		}
-		else {
-			return unlocal;
-		}
-
-	}*/
-
-	/*	@Override
-	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
-		try {
-			if (this.dustInfo != null){
-				if (entityHolding instanceof EntityPlayer){
-					if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode){
-						EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.dustInfo.vRadiationLevel, world, entityHolding);	
-					}
-				}
-			}		
-		}
-		catch (Throwable t) {
-			t.printStackTrace();
-		}
-	}*/
-
-	/*@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-
-		if (stack.getDisplayName().toLowerCase().contains("fluorite")){
-			list.add("Mined from Sandstone and Limestone.");
-		}
-		if (this.dustInfo != null){
-			list.add(this.dustInfo.vChemicalFormula);
-		}
-		if (this.dustInfo.vRadiationLevel > 0){
-			list.add(CORE.GT_Tooltip_Radioactive);
-		}
-
-
-		//}
-		super.addInformation(stack, aPlayer, list, bool);
-	}*/
-
 	public static class DustState {
 		static final int NORMAL = (1);
 		static final int SMALL = (10);
@@ -208,8 +87,7 @@ public class BaseItemDust extends BaseItemComponent {
 			else if (amount == 10) {
 				doesThings[0] = false;
 				doesThings[1] = true;
-				doesThings[2] = false;
-				
+				doesThings[2] = false;				
 			}
 			else if (amount == 100) {
 				doesThings[0] = false;
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index e1c3e179ee..e4fa06c58e 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -118,7 +118,7 @@ public class BaseItemDustUnique extends Item{
 
 	private String getCorrectTexture(final String pileSize){
 		if (!CORE.ConfigSwitches.useGregtechTextures){
-			if ((pileSize == "dust") || (pileSize == "Dust")){
+			if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))){
 				this.setTextureName(CORE.MODID + ":" + "dust");}
 			else{
 				this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
index 51b133241b..251230932c 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
@@ -9,10 +9,10 @@ import net.minecraft.item.ItemStack;
 
 import gtPlusPlus.api.interfaces.ITileTooltip;
 
-public class ItemBlockBasicTile extends ItemBlock{
+public class ItemBlockBasicTile extends ItemBlock {
 
 	private final int mID;
-	
+
 	public ItemBlockBasicTile(final Block block) {
 		super(block);
 		this.mID = ((ITileTooltip) block).getTooltipID();
@@ -21,37 +21,50 @@ public class ItemBlockBasicTile extends ItemBlock{
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		if (this.mID == 0){ //Fish trap
-			list.add("This trap catches fish faster if surrounded by more water blocks");	
-			list.add("Can also be placed beside upto 4 other fish traps");	
-			list.add("Requires at least two faces touching water");		
-			list.add("1/1000 chance to produce triple loot.");		
-		}
-		else if (this.mID == 1){ //Modularity
-			list.add("Used to construct modular armour & bauble upgrades..");			
-		}
-		else if (this.mID == 2){ //Trade
-			list.add("Allows for SMP trade-o-mat type trading.");			
-		}
-		else if (this.mID == 3){ //Project
-			list.add("Scan any crafting recipe in this to mass fabricate them in the Autocrafter..");			
-		}
-		else if (this.mID == 4){ //Circuit Table
+		if (this.mID == 0) { // Fish trap
+			list.add("This trap catches fish faster if surrounded by more water blocks");
+			list.add("Can also be placed beside upto 4 other fish traps");
+			list.add("Requires at least two faces touching water");
+			list.add("1/1000 chance to produce triple loot.");
+		} 
+		else if (this.mID == 1) { // Modularity
+			list.add("Used to construct modular armour & bauble upgrades..");
+		} 
+		else if (this.mID == 2) { // Trade
+			list.add("Allows for SMP trade-o-mat type trading.");
+		} 
+		else if (this.mID == 3) { // Project
+			list.add("Scan any crafting recipe in this to mass fabricate them in the Autocrafter..");
+		} 
+		else if (this.mID == 4) { // Circuit Table
 			list.add("Easy Circuit Configuration");
 			list.add("Change default setting with a Screwdriver");
-			list.add("Default is used to select slot for auto-insertion");			
+			list.add("Default is used to select slot for auto-insertion");
+		} 
+		else if (this.mID == 5) { // Decayables Chest
+			list.add("Chest which holds radioactive materials");
+			list.add("Items which decay will tick while inside");
+			list.add("Place with right click");
+		} 
+		else if (this.mID == 6) { // Butterfly Killer
+			list.add("Kills Forestry Butterflies, Bats and other pests");
+			list.add("Use either Formaldehyde or Hydrogen cyanide");
+			list.add("Be weary of your neighbours");
+		} 
+		else if (this.mID == 7) {
+
+		} 
+		else if (this.mID == 8){
+			
 		}
-		else if (this.mID == 5){ //Decayables Chest
-			list.add("Chest which holds radioactive materials");	
-			list.add("Items which decay will tick while inside");	
-			list.add("Place with right click");			
+		else if (this.mID == 9){
+			
 		}
+
 		else {
-			list.add("Bad Tooltip ID - "+mID);
-			
+			list.add("Bad Tooltip ID - " + mID);
 		}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
-	
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
deleted file mode 100644
index 9badd384d8..0000000000
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gtPlusPlus.core.item.base.itemblock;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-import gtPlusPlus.api.interfaces.ITileTooltip;
-
-public class ItemBlockBasicTooltip extends ItemBlock{
-
-	protected final int mID;
-	
-	public ItemBlockBasicTooltip(final Block block) {
-		super(block);
-		this.mID = ((ITileTooltip) block).getTooltipID();
-	}	
-	
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		if (this.mID == 0){ //blockDarkWorldPortalFrame
-			list.add("Assembled in the same shape as the Nether Portal.");			
-		}
-		else if (this.mID == 1){ //Modularity
-			list.add("Used to construct modular armour & bauble upgrades..");			
-		}
-	}
-	
-
-}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
new file mode 100644
index 0000000000..2d0fd00dd9
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
@@ -0,0 +1,110 @@
+package gtPlusPlus.core.item.base.itemblock;
+import java.util.List;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlockWithMetadata;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
+{
+	private final Block mBlock;
+
+	public ItemBlockRoundRobinator(final Block aBlock){
+		super(aBlock, aBlock);
+		this.mBlock = aBlock;
+	}
+	
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		list.add("Attempts to output items evenly on all four horizontal planes");		
+		if (stack.getItemDamage() == 0) {
+			list.add("1 Item per enabled side every 400 ticks");			
+		}
+		else if (stack.getItemDamage() == 1) {
+			list.add("1 Item per enabled side every 100 ticks");			
+		}
+		else if (stack.getItemDamage() == 2) {
+			list.add("1 Item per enabled side every 20 ticks");			
+		}
+		else if (stack.getItemDamage() == 3) {
+			list.add("1 Item per enabled side every 10 ticks");			
+		}
+		else if (stack.getItemDamage() == 4) {
+			list.add("1 Item per enabled side every tick");			
+		}		
+		list.add("Top and bottom do not pull, so you must push items in");
+		list.add("Sides can also be disabled with a screwdriver");	
+		list.add("Shift+RMB with empty hand to view inventory contents");	
+		super.addInformation(stack, aPlayer, list, bool);		
+	}
+
+	/**
+	 * Gets an icon index based on an item's damage value
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIconFromDamage(final int p_77617_1_)
+	{
+		return this.mBlock.getIcon(0, p_77617_1_);
+	}
+
+	/**
+	 * Returns the metadata of the block which this Item (ItemBlock) can place
+	 */
+	@Override
+	public int getMetadata(final int p_77647_1_)
+	{
+		return p_77647_1_;
+	}
+
+	@Override
+	public String getUnlocalizedName(final ItemStack stack) {
+		return this.getUnlocalizedName() + "." + stack.getItemDamage();
+	}
+
+	@Override
+	public boolean isDamageable() {
+		return false;
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) {
+		return false;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+		return false;
+	}
+
+	@Override
+	public int getDisplayDamage(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		return 0;
+	}
+
+	@Override
+	public int getItemEnchantability(ItemStack stack) {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 277114a6ae..c5b7191ddd 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -128,10 +128,20 @@ public class BaseOreComponent extends Item{
 	public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 		if (this.materialName != null && !this.materialName.equals("")){
 			if (this.componentMaterial != null){
-				if (!this.componentMaterial.vChemicalFormula.equals("??") && !this.componentMaterial.vChemicalFormula.equals("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+				if (!this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
 					list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula));
 				}
-
+				else if (this.componentMaterial.vChemicalFormula.contains("?") && this.componentMaterial.getState() != MaterialState.PURE_LIQUID) {
+					String temp = componentMaterial.vChemicalFormula;
+					temp = temp.replace(" ", "");
+					temp = temp.replace("-", "");
+					temp = temp.replace("_", "");
+					temp = temp.replace("!", "");
+					temp = temp.replace("@", "");
+					temp = temp.replace("#", "");
+					temp = temp.replace(" ", "");				
+					list.add(temp);
+				}
 				if (this.componentMaterial.isRadioactive){
 					list.add(CORE.GT_Tooltip_Radioactive+" | Level: "+this.componentMaterial.vRadiationLevel);
 				}
diff --git a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
index 2e40d86473..70de4603e7 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
@@ -90,7 +90,7 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 		String aString2 = StatCollector.translateToLocal("GTPP.battpack.tooltip.2");
 		String aString3 = StatCollector.translateToLocal("GTPP.battpack.tooltip.3");
 		String aString4 = StatCollector.translateToLocal("GTPP.battpack.tooltip.4");
-		
+
 		String aEU = StatCollector.translateToLocal("GTPP.info.eu");	
 		String aEUT = aEU+"/t";
 
@@ -128,31 +128,34 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 	@Override // TODO
 	public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase aPlayer) {
 		if (!aPlayer.worldObj.isRemote) {
-			if (this.getCharge(aBaubleStack) >= getTransferLimit(aBaubleStack)) {
-				// Try Iterate Armour Slots of Player
-				if (aPlayer instanceof EntityPlayer) {
-
-					// amour
-					for (final ItemStack aInvStack : ((EntityPlayer) aPlayer).inventory.armorInventory) {
-						if (aInvStack != null) {
-							if (aInvStack == aBaubleStack) {
-								continue;
-							}
-							if (ChargingHelper.isItemValid(aInvStack)) {
-								double aTransferRate = 0;
-								final IElectricItem electricItem = (IElectricItem) aInvStack.getItem();
-								if (electricItem != null) {
-									aTransferRate = electricItem.getTransferLimit(aInvStack);
-									double aItemCharge = ElectricItem.manager.getCharge(aInvStack);
-									if (aItemCharge >= 0 && aItemCharge != electricItem.getMaxCharge(aInvStack)) {
-										if (aItemCharge <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
+
+			try {
+
+				if (this.getCharge(aBaubleStack) >= getTransferLimit(aBaubleStack)) {
+					// Try Iterate Armour Slots of Player
+					if (aPlayer instanceof EntityPlayer) {
+
+						// amour
+						for (final ItemStack aInvStack : ((EntityPlayer) aPlayer).inventory.armorInventory) {
+							if (aInvStack != null) {
+								if (aInvStack == aBaubleStack) {
+									continue;
+								}
+								if (ChargingHelper.isItemValid(aInvStack)) {
+									double aTransferRate = 0;
+									final IElectricItem electricItem = (IElectricItem) aInvStack.getItem();
+									if (electricItem != null) {
+										aTransferRate = electricItem.getTransferLimit(aInvStack);
+										double aItemCharge = ElectricItem.manager.getCharge(aInvStack);
+										if (aItemCharge >= 0 && aItemCharge != electricItem.getMaxCharge(aInvStack)) {
+											if (aItemCharge <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
 												if (ElectricItem.manager.getCharge(aBaubleStack) >= aTransferRate) {
 													if (ElectricItem.manager.getCharge(aInvStack) <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
 														double d = ElectricItem.manager.charge(aInvStack, aTransferRate * 16, mTier, false, true);
 														if (d > 0) {
-														d = ElectricItem.manager.charge(aInvStack, aTransferRate * 16, mTier, false, false);
-														ElectricItem.manager.discharge(aBaubleStack, d, mTier, false, true,	false);
-														//Logger.INFO("Charging " + aInvStack.getDisplayName() + " | " + d	 + " | "+electricItem.getMaxCharge(aInvStack));
+															d = ElectricItem.manager.charge(aInvStack, aTransferRate * 16, mTier, false, false);
+															ElectricItem.manager.discharge(aBaubleStack, d, mTier, false, true,	false);
+															//Logger.INFO("Charging " + aInvStack.getDisplayName() + " | " + d	 + " | "+electricItem.getMaxCharge(aInvStack));
 														}
 													}
 													else {
@@ -167,29 +170,29 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 												//Logger.INFO("3");
 											}
 
+										}
+										else {
+											//Logger.INFO("1");
+										}
 									}
-									else {
-										//Logger.INFO("1");
-									}
-								}
 
+								}
+							}
+							if (this.getCharge(aBaubleStack) > 0) {
+								continue;
+							} else {
+								break;
 							}
 						}
-						if (this.getCharge(aBaubleStack) > 0) {
-							continue;
-						} else {
-							break;
-						}
-					}
 
-					// Hotbar Slots
-					int aSlotCounter = 0;
-					for (final ItemStack aInvStack : ((EntityPlayer) aPlayer).inventory.mainInventory) {
-						if (aSlotCounter > (InventoryPlayer.getHotbarSize() - 1)) {
-							break;
-						}
-						aSlotCounter++;
-						if (aInvStack != null) {
+						// Hotbar Slots
+						int aSlotCounter = 0;
+						for (final ItemStack aInvStack : ((EntityPlayer) aPlayer).inventory.mainInventory) {
+							if (aSlotCounter > (InventoryPlayer.getHotbarSize() - 1)) {
+								break;
+							}
+							aSlotCounter++;
+							if (aInvStack != null) {
 								if (aInvStack == aBaubleStack) {
 									continue;
 								}
@@ -201,26 +204,26 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 										double aItemCharge = ElectricItem.manager.getCharge(aInvStack);
 										if (aItemCharge >= 0 && aItemCharge != electricItem.getMaxCharge(aInvStack)) {
 											if (aItemCharge <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
-													if (ElectricItem.manager.getCharge(aBaubleStack) >= aTransferRate) {
-														if (ElectricItem.manager.getCharge(aInvStack) <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
-															double d = ElectricItem.manager.charge(aInvStack, aTransferRate, mTier, false, true);
-															if (d > 0) {
+												if (ElectricItem.manager.getCharge(aBaubleStack) >= aTransferRate) {
+													if (ElectricItem.manager.getCharge(aInvStack) <= (electricItem.getMaxCharge(aInvStack) - aTransferRate)) {
+														double d = ElectricItem.manager.charge(aInvStack, aTransferRate, mTier, false, true);
+														if (d > 0) {
 															d = ElectricItem.manager.charge(aInvStack, aTransferRate, mTier, false, false);
 															ElectricItem.manager.discharge(aBaubleStack, d, mTier, false, true,	false);
 															//Logger.INFO("Charging " + aInvStack.getDisplayName() + " | " + d	 + " | "+electricItem.getMaxCharge(aInvStack));
-															}
-														}
-