$ Cleaned up the entire project.

> Much neat, very nices.

35 files changed, 1722 insertions, 1603 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java
index e9e2317044..e92e69f0e0 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java
@@ -1,8 +1,5 @@
 package gtPlusPlus.core.item.base;
 
-import static gregtech.api.enums.GT_Values.D1;
-import static gregtech.api.enums.GT_Values.V;
-
 import java.util.*;
 
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -33,474 +30,602 @@ import net.minecraft.util.IIcon;
 public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricItemManager {
 
 	/* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
-	private final HashMap<Short, ArrayList<IItemBehaviour<BaseEuItem>>> mItemBehaviors = new HashMap<Short, ArrayList<IItemBehaviour<BaseEuItem>>>();
-	public final short mOffset, mItemAmount;
-	public final BitSet mEnabledItems;
-	public final BitSet mVisibleItems;
-	public final IIcon[][] mIconList;
-	 /** The unlocalized name of this item. */
-    private String unlocalizedName;
-	
-	private ArrayList<Pair<Integer, EnumRarity>> rarity = new ArrayList<Pair<Integer, EnumRarity>>();
-	private ArrayList<Pair<Integer, EnumChatFormatting>> descColour = new ArrayList<Pair<Integer, EnumChatFormatting>>();
-	private ArrayList<Pair<Integer, String>> itemName = new ArrayList<Pair<Integer, String>>();
-	private ArrayList<Pair<Integer, String>> itemDescription = new ArrayList<Pair<Integer, String>>();
-	private ArrayList<Pair<Integer, Boolean>> hasEffect = new ArrayList<Pair<Integer, Boolean>>();
-
-	public final HashMap<Short, Long[]> mElectricStats = new HashMap<Short, Long[]>();
-	public final HashMap<Short, Short> mBurnValues = new HashMap<Short, Short>();
+	private final HashMap<Short, ArrayList<IItemBehaviour<BaseEuItem>>>	mItemBehaviors	= new HashMap<Short, ArrayList<IItemBehaviour<BaseEuItem>>>();
+	public final short													mOffset, mItemAmount;
+	public final BitSet													mEnabledItems;
+	public final BitSet													mVisibleItems;
+	public final IIcon[][]												mIconList;
+	/** The unlocalized name of this item. */
+	private String														unlocalizedName;
+
+	private final ArrayList<Pair<Integer, EnumRarity>>					rarity			= new ArrayList<Pair<Integer, EnumRarity>>();
+	private final ArrayList<Pair<Integer, EnumChatFormatting>>			descColour		= new ArrayList<Pair<Integer, EnumChatFormatting>>();
+	private final ArrayList<Pair<Integer, String>>						itemName		= new ArrayList<Pair<Integer, String>>();
+	private final ArrayList<Pair<Integer, String>>						itemDescription	= new ArrayList<Pair<Integer, String>>();
+	private final ArrayList<Pair<Integer, Boolean>>						hasEffect		= new ArrayList<Pair<Integer, Boolean>>();
+
+	public final HashMap<Short, Long[]>									mElectricStats	= new HashMap<Short, Long[]>();
+	public final HashMap<Short, Short>									mBurnValues		= new HashMap<Short, Short>();
 
 	public BaseEuItem() {
-		this("MU-metaitem.02", AddToCreativeTab.tabOther, (short) 1000, (short) 31766);		
-	}	
-		
-	public BaseEuItem(String unlocalizedName, CreativeTabs creativeTab, short aOffset, short aItemAmount) {
-		mEnabledItems = new BitSet(aItemAmount);
-		mVisibleItems = new BitSet(aItemAmount);
-		mOffset = (short) Math.min(32766, aOffset);
-		mItemAmount = (short) Math.min(aItemAmount, 32766 - mOffset);
-		mIconList = new IIcon[aItemAmount][1];
-		setHasSubtypes(true);
-		setMaxDamage(0);
-    	setUnlocalizedName(unlocalizedName);
-		setCreativeTab(creativeTab);
-		setMaxStackSize(1);		
-		GameRegistry.registerItem(this, unlocalizedName);
-	}	
-	
-	
-	public void registerItem(int id, String localizedName, long euStorage, int tier, String description) {
-		registerItem(id, localizedName, euStorage, (short) tier, description, EnumRarity.common, EnumChatFormatting.GRAY, false);
-	}
-	
-	public void registerItem(int id, String localizedName, long euStorage, int tier, String description, int burnTime) {
-		registerItem(id, localizedName, euStorage, (short) tier, description, EnumRarity.common, EnumChatFormatting.GRAY, false);
-		setBurnValue(id, burnTime);
-	}
-	
-	
-	public void registerItem(int id, String localizedName, long euStorage, short tier, String description, EnumRarity regRarity, EnumChatFormatting colour, boolean Effect) {
-		addItem(id, localizedName, EnumChatFormatting.YELLOW+"Electric", new Object[]{});
-        setElectricStats(mOffset + id, euStorage, GT_Values.V[tier], tier, -3L, true);
-		this.rarity.add(new Pair<Integer, EnumRarity>(id, regRarity));
-		this.itemName.add(new Pair<Integer, String>(id, localizedName));
-		this.itemDescription.add(new Pair<Integer, String>(id, description));
-		this.descColour.add(new Pair<Integer, EnumChatFormatting>(id, colour));
-		this.hasEffect.add(new Pair<Integer, Boolean>(id, Effect));
-	}	
+		this("MU-metaitem.02", AddToCreativeTab.tabOther, (short) 1000, (short) 31766);
+	}
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public EnumRarity getRarity(ItemStack par1ItemStack){
-		if (rarity.get(par1ItemStack.getItemDamage()-mOffset) != null)
-		return rarity.get(par1ItemStack.getItemDamage()-mOffset).getValue();
-		return EnumRarity.common;
+	public BaseEuItem(final String unlocalizedName, final CreativeTabs creativeTab, final short aOffset,
+			final short aItemAmount) {
+		this.mEnabledItems = new BitSet(aItemAmount);
+		this.mVisibleItems = new BitSet(aItemAmount);
+		this.mOffset = (short) Math.min(32766, aOffset);
+		this.mItemAmount = (short) Math.min(aItemAmount, 32766 - this.mOffset);
+		this.mIconList = new IIcon[aItemAmount][1];
+		this.setHasSubtypes(true);
+		this.setMaxDamage(0);
+		this.setUnlocalizedName(unlocalizedName);
+		this.setCreativeTab(creativeTab);
+		this.setMaxStackSize(1);
+		GameRegistry.registerItem(this, unlocalizedName);
 	}
 
+	@SuppressWarnings({
+			"unchecked", "rawtypes"
+	})
 	@Override
-	public boolean hasEffect(ItemStack par1ItemStack){
-		if (hasEffect.get(par1ItemStack.getItemDamage()-mOffset) != null)
-		return hasEffect.get(par1ItemStack.getItemDamage()-mOffset).getValue();
-		return false;
+	public final void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, List aList,
+			final boolean aF3_H) {
+		// aList.add("Meta: "+(aStack.getItemDamage()-mOffset));
+		if (this.descColour.get(aStack.getItemDamage() - this.mOffset) != null
+				&& this.itemDescription.get(aStack.getItemDamage() - this.mOffset) != null) {
+			aList.add(this.descColour.get(aStack.getItemDamage() - this.mOffset).getValue()
+					+ this.itemDescription.get(aStack.getItemDamage() - this.mOffset).getValue());
+		}
+		final String tKey = this.getUnlocalizedName(aStack) + ".tooltip",
+				tString = GT_LanguageManager.getTranslation(tKey);
+		if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) {
+			aList.add(tString);
+		}
+		final Long[] tStats = this.getElectricStats(aStack);
+		if (tStats != null) {
+			if (tStats[3] > 0) {
+				aList.add(EnumChatFormatting.AQUA + "Contains " + GT_Utility.formatNumbers(tStats[3]) + " EU   Tier: "
+						+ (tStats[2] >= 0 ? tStats[2] : 0) + EnumChatFormatting.GRAY);
+			}
+			else {
+				final long tCharge = this.getRealCharge(aStack);
+				if (tStats[3] == -2 && tCharge <= 0) {
+					aList.add(EnumChatFormatting.AQUA + "Empty. You should recycle it properly."
+							+ EnumChatFormatting.GRAY);
+				}
+				else {
+					aList.add(EnumChatFormatting.AQUA + "" + GT_Utility.formatNumbers(tCharge) + " / "
+							+ GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: "
+							+ GT_Values.V[(int) (tStats[2] >= 0
+									? tStats[2] < GT_Values.V.length ? tStats[2] : GT_Values.V.length - 1 : 1)]
+							+ EnumChatFormatting.GRAY);
+				}
+			}
+		}
+		final ArrayList<IItemBehaviour<BaseEuItem>> tList = this.mItemBehaviors.get((short) this.getDamage(aStack));
+		if (tList != null) {
+			for (final IItemBehaviour<BaseEuItem> tBehavior : tList) {
+				aList = tBehavior.getAdditionalToolTips(this, aList, aStack);
+			}
+		}
 	}
 
-	
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-    public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
-		//aList.add("Meta: "+(aStack.getItemDamage()-mOffset));
-		if (descColour.get(aStack.getItemDamage()-mOffset) != null && itemDescription.get(aStack.getItemDamage()-mOffset) != null)			
-		aList.add(descColour.get(aStack.getItemDamage()-mOffset).getValue()+itemDescription.get(aStack.getItemDamage()-mOffset).getValue());
-        String tKey = getUnlocalizedName(aStack) + ".tooltip", tString = GT_LanguageManager.getTranslation(tKey);
-        if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) aList.add(tString);
-        Long[] tStats = getElectricStats(aStack);
-        if (tStats != null) {
-            if (tStats[3] > 0) {
-                aList.add(EnumChatFormatting.AQUA + "Contains " + GT_Utility.formatNumbers(tStats[3]) + " EU   Tier: " + (tStats[2] >= 0 ? tStats[2] : 0) + EnumChatFormatting.GRAY);
-            } else {
-                long tCharge = getRealCharge(aStack);
-                if (tStats[3] == -2 && tCharge <= 0) {
-                    aList.add(EnumChatFormatting.AQUA + "Empty. You should recycle it properly." + EnumChatFormatting.GRAY);
-                } else {
-                    aList.add(EnumChatFormatting.AQUA + "" + GT_Utility.formatNumbers(tCharge) + " / " + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)] + EnumChatFormatting.GRAY);
-                }
-            }
-        }        
-        ArrayList<IItemBehaviour<BaseEuItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
-        if (tList != null) for (IItemBehaviour<BaseEuItem> tBehavior : tList)
-            aList = tBehavior.getAdditionalToolTips(this, aList, aStack);        
-	}
-	
-	
-	@Override
-	public final Item getChargedItem(ItemStack itemStack) {
-		return this;
+	/**
+	 * This adds a Custom Item to the ending Range.
+	 *
+	 * @param aID
+	 *            The Id of the assigned Item [0 - mItemAmount] (The MetaData
+	 *            gets auto-shifted by +mOffset)
+	 * @param aEnglish
+	 *            The Default Localized Name of the created Item
+	 * @param aToolTip
+	 *            The Default ToolTip of the created Item, you can also insert
+	 *            null for having no ToolTip
+	 * @param aFoodBehavior
+	 *            The Food Value of this Item. Can be null aswell. Just a
+	 *            convenience thing.
+	 * @param aRandomData
+	 *            The OreDict Names you want to give the Item. Also used for TC
+	 *            Aspects and some other things.
+	 * @return An ItemStack containing the newly created Item.
+	 */
+	@SuppressWarnings("unchecked")
+	public final ItemStack addItem(final int aID, final String aEnglish, String aToolTip, final Object... aRandomData) {
+		if (aToolTip == null) {
+			aToolTip = "";
+		}
+		if (aID >= 0 && aID < this.mItemAmount) {
+			final ItemStack rStack = new ItemStack(this, 1, this.mOffset + aID);
+			this.mEnabledItems.set(aID);
+			this.mVisibleItems.set(aID);
+			GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish);
+			GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip);
+			final List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>();
+			// Important Stuff to do first
+			for (final Object tRandomData : aRandomData) {
+				if (tRandomData instanceof SubTag) {
+					if (tRandomData == SubTag.INVISIBLE) {
+						this.mVisibleItems.set(aID, false);
+						continue;
+					}
+					if (tRandomData == SubTag.NO_UNIFICATION) {
+						GT_OreDictUnificator.addToBlacklist(rStack);
+						continue;
+					}
+				}
+			}
+			// now check for the rest
+			for (final Object tRandomData : aRandomData) {
+				if (tRandomData != null) {
+					boolean tUseOreDict = true;
+					if (tRandomData instanceof IItemBehaviour) {
+						this.addItemBehavior(this.mOffset + aID, (IItemBehaviour<BaseEuItem>) tRandomData);
+						tUseOreDict = false;
+					}
+					if (tRandomData instanceof IItemContainer) {
+						((IItemContainer) tRandomData).set(rStack);
+						tUseOreDict = false;
+					}
+					if (tRandomData instanceof SubTag) {
+						continue;
+					}
+					if (tRandomData instanceof TC_AspectStack) {
+						((TC_AspectStack) tRandomData).addToAspectList(tAspects);
+						continue;
+					}
+					if (tRandomData instanceof ItemData) {
+						if (GT_Utility.isStringValid(tRandomData)) {
+							GT_OreDictUnificator.registerOre(tRandomData, rStack);
+						}
+						else {
+							GT_OreDictUnificator.addItemData(rStack, (ItemData) tRandomData);
+						}
+						continue;
+					}
+					if (tUseOreDict) {
+						GT_OreDictUnificator.registerOre(tRandomData, rStack);
+						continue;
+					}
+				}
+			}
+			if (GregTech_API.sThaumcraftCompat != null) {
+				GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
+			}
+			return rStack;
+		}
+		return null;
 	}
 
-	@Override
-	public final Item getEmptyItem(ItemStack itemStack) {
+	/**
+	 * Adds a special Item Behaviour to the Item.
+	 * <p/>
+	 * Note: the boolean Behaviours sometimes won't be executed if another
+	 * boolean Behaviour returned true before.
+	 *
+	 * @param aMetaValue
+	 *            the Meta Value of the Item you want to add it to. [0 - 32765]
+	 * @param aBehavior
+	 *            the Click Behavior you want to add.
+	 * @return the Item itself for convenience in constructing.
+	 */
+	public final BaseEuItem addItemBehavior(final int aMetaValue, final IItemBehaviour<BaseEuItem> aBehavior) {
+		if (aMetaValue < 0 || aMetaValue >= 32766 || aBehavior == null) {
+			return this;
+		}
+		ArrayList<IItemBehaviour<BaseEuItem>> tList = this.mItemBehaviors.get((short) aMetaValue);
+		if (tList == null) {
+			tList = new ArrayList<IItemBehaviour<BaseEuItem>>(1);
+			this.mItemBehaviors.put((short) aMetaValue, tList);
+		}
+		tList.add(aBehavior);
 		return this;
 	}
 
 	@Override
-	public final double getMaxCharge(ItemStack aStack) {
-		Long[] tStats = getElectricStats(aStack);
-		if (tStats == null) return 0;
-		return Math.abs(tStats[0]);
+	public final boolean canProvideEnergy(final ItemStack aStack) {
+		final Long[] tStats = this.getElectricStats(aStack);
+		if (tStats == null) {
+			return false;
+		}
+		return tStats[3] > 0 || aStack.stackSize == 1 && (tStats[3] == -2 || tStats[3] == -3);
 	}
 
 	@Override
-	public final double getTransferLimit(ItemStack aStack) {
-		Long[] tStats = getElectricStats(aStack);
-		if (tStats == null) return 0;
-		return Math.max(tStats[1], tStats[3]);
+	public final boolean canUse(final ItemStack aStack, final double aAmount) {
+		return this.getRealCharge(aStack) >= aAmount;
 	}
 
 	@Override
-	public final int getTier(ItemStack aStack) {
-		Long[] tStats = getElectricStats(aStack);
-		return (int) (tStats == null ? Integer.MAX_VALUE : tStats[2]);
+	public final double charge(final ItemStack aStack, final double aCharge, final int aTier,
+			final boolean aIgnoreTransferLimit, final boolean aSimulate) {
+		final Long[] tStats = this.getElectricStats(aStack);
+		if (tStats == null || tStats[2] > aTier
+				|| !(tStats[3] == -1 || tStats[3] == -3 || tStats[3] < 0 && aCharge == Integer.MAX_VALUE)
+				|| aStack.stackSize != 1) {
+			return 0;
+		}
+		final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = aCharge == Integer.MAX_VALUE
+				? Long.MAX_VALUE
+				: Math.min(Math.abs(tStats[0]),
+						tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
+		if (!aSimulate) {
+			this.setCharge(aStack, tNewCharge);
+		}
+		return tNewCharge - tChargeBefore;
 	}
 
 	@Override
-	public final double charge(ItemStack aStack, double aCharge, int aTier, boolean aIgnoreTransferLimit, boolean aSimulate) {
-		Long[] tStats = getElectricStats(aStack);
-		if (tStats == null || tStats[2] > aTier || !(tStats[3] == -1 || tStats[3] == -3 || (tStats[3] < 0 && aCharge == Integer.MAX_VALUE)) || aStack.stackSize != 1)
-			return 0;
-		long tChargeBefore = getRealCharge(aStack), tNewCharge = aCharge == Integer.MAX_VALUE ? Long.MAX_VALUE : Math.min(Math.abs(tStats[0]), tChargeBefore + (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
-		if (!aSimulate) setCharge(aStack, tNewCharge);
-		return tNewCharge - tChargeBefore;
+	public final void chargeFromArmor(final ItemStack aStack, final EntityLivingBase aPlayer) {
+		if (aPlayer == null || aPlayer.worldObj.isRemote) {
+			return;
+		}
+		for (int i = 1; i < 5; i++) {
+			final ItemStack tArmor = aPlayer.getEquipmentInSlot(i);
+			if (GT_ModHandler.isElectricItem(tArmor)) {
+				final IElectricItem tArmorItem = (IElectricItem) tArmor.getItem();
+				if (tArmorItem.canProvideEnergy(tArmor) && tArmorItem.getTier(tArmor) >= this.getTier(aStack)) {
+					final double tCharge = ElectricItem.manager.discharge(tArmor,
+							this.charge(aStack, Integer.MAX_VALUE - 1, Integer.MAX_VALUE, true, true),
+							Integer.MAX_VALUE, true, true, false);
+					if (tCharge > 0) {
+						this.charge(aStack, tCharge, Integer.MAX_VALUE, true, false);
+						if (aPlayer instanceof EntityPlayer) {
+							final Container tContainer = ((EntityPlayer) aPlayer).openContainer;
+							if (tContainer != null) {
+								tContainer.detectAndSendChanges();
+							}
+						}
+					}
+				}
+			}
+		}
 	}
 
 	@Override
-	public final double discharge(ItemStack aStack, double aCharge, int aTier, boolean aIgnoreTransferLimit, boolean aBatteryAlike, boolean aSimulate) {
-		Long[] tStats = getElectricStats(aStack);
-		if (tStats == null || tStats[2] > aTier) return 0;
-		if (aBatteryAlike && !canProvideEnergy(aStack)) return 0;
+	public final double discharge(final ItemStack aStack, final double aCharge, final int aTier,
+			final boolean aIgnoreTransferLimit, final boolean aBatteryAlike, final boolean aSimulate) {
+		final Long[] tStats = this.getElectricStats(aStack);
+		if (tStats == null || tStats[2] > aTier) {
+			return 0;
+		}
+		if (aBatteryAlike && !this.canProvideEnergy(aStack)) {
+			return 0;
+		}
 		if (tStats[3] > 0) {
-			if (aCharge < tStats[3] || aStack.stackSize < 1) return 0;
-			if (!aSimulate) aStack.stackSize--;
+			if (aCharge < tStats[3] || aStack.stackSize < 1) {
+				return 0;
+			}
+			if (!aSimulate) {
+				aStack.stackSize--;
+			}
 			return tStats[3];
 		}
-		long tChargeBefore = getRealCharge(aStack), tNewCharge = Math.max(0, tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
-		if (!aSimulate) setCharge(aStack, tNewCharge);
+		final long tChargeBefore = this.getRealCharge(aStack), tNewCharge = Math.max(0,
+				tChargeBefore - (aIgnoreTransferLimit ? (long) aCharge : Math.min(tStats[1], (long) aCharge)));
+		if (!aSimulate) {
+			this.setCharge(aStack, tNewCharge);
+		}
 		return tChargeBefore - tNewCharge;
 	}
 
 	@Override
-	public final double getCharge(ItemStack aStack) {
-		return getRealCharge(aStack);
+	public final double getCharge(final ItemStack aStack) {
+		return this.getRealCharge(aStack);
 	}
 
 	@Override
-	public final boolean canUse(ItemStack aStack, double aAmount) {
-		return getRealCharge(aStack) >= aAmount;
+	public final Item getChargedItem(final ItemStack itemStack) {
+		return this;
 	}
 
-	@Override
-	public final boolean use(ItemStack aStack, double aAmount, EntityLivingBase aPlayer) {
-		chargeFromArmor(aStack, aPlayer);
-		if (aPlayer instanceof EntityPlayer && ((EntityPlayer) aPlayer).capabilities.isCreativeMode) return true;
-		double tTransfer = discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, true);
-		if (tTransfer == aAmount) {
-			discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false);
-			chargeFromArmor(aStack, aPlayer);
-			return true;
-		}
-		discharge(aStack, aAmount, Integer.MAX_VALUE, true, false, false);
-		chargeFromArmor(aStack, aPlayer);
-		return false;
+	@SuppressWarnings("static-method")
+	public short getChargedMetaData(final ItemStack aStack) {
+		return (short) aStack.getItemDamage();
 	}
 
-	@Override
-	public final boolean canProvideEnergy(ItemStack aStack) {
-		Long[] tStats = getElectricStats(aStack);
-		if (tStats == null) return false;
-		return tStats[3] > 0 || (aStack.stackSize == 1 && (tStats[3] == -2 || tStats[3] == -3));
+	public final Long[] getElectricStats(final ItemStack aStack) {
+		return this.mElectricStats.get((short) aStack.getItemDamage());
 	}
 
 	@Override
-	public final void chargeFromArmor(ItemStack aStack, EntityLivingBase aPlayer) {
-		if (aPlayer == null || aPlayer.worldObj.isRemote) return;
-		for (int i = 1; i < 5; i++) {
-			ItemStack tArmor = aPlayer.getEquipmentInSlot(i);
-			if (GT_ModHandler.isElectricItem(tArmor)) {
-				IElectricItem tArmorItem = (IElectricItem) tArmor.getItem();
-				if (tArmorItem.canProvideEnergy(tArmor) && tArmorItem.getTier(tArmor) >= getTier(aStack)) {
-					double tCharge = ElectricItem.manager.discharge(tArmor, charge(aStack, Integer.MAX_VALUE - 1, Integer.MAX_VALUE, true, true), Integer.MAX_VALUE, true, true, false);
-					if (tCharge > 0) {
-						charge(aStack, tCharge, Integer.MAX_VALUE, true, false);
-						if (aPlayer instanceof EntityPlayer) {
-							Container tContainer = ((EntityPlayer) aPlayer).openContainer;
-							if (tContainer != null) tContainer.detectAndSendChanges();
-						}
-					}
-				}
-			}
-		}
-	}	
-
-	public final long getRealCharge(ItemStack aStack) {
-		Long[] tStats = getElectricStats(aStack);
-		if (tStats == null) return 0;
-		if (tStats[3] > 0) return (int) (long) tStats[3];
-		NBTTagCompound tNBT = aStack.getTagCompound();
-		return tNBT == null ? 0 : tNBT.getLong("GT.ItemCharge");
-	}	
-
-	public final boolean setCharge(ItemStack aStack, long aCharge) {
-		Long[] tStats = getElectricStats(aStack);
-		if (tStats == null || tStats[3] > 0) return false;
-		NBTTagCompound tNBT = aStack.getTagCompound();
-		if (tNBT == null) tNBT = new NBTTagCompound();
-		tNBT.removeTag("GT.ItemCharge");
-		aCharge = Math.min(tStats[0] < 0 ? Math.abs(tStats[0] / 2) : aCharge, Math.abs(tStats[0]));
-		if (aCharge > 0) {
-			aStack.setItemDamage(getChargedMetaData(aStack));
-			tNBT.setLong("GT.ItemCharge", aCharge);
-		} else {
-			aStack.setItemDamage(getEmptyMetaData(aStack));
-		}
-		if (tNBT.hasNoTags()) aStack.setTagCompound(null);
-		else aStack.setTagCompound(tNBT);
-		isItemStackUsable(aStack);
-		return true;
+	public final Item getEmptyItem(final ItemStack itemStack) {
+		return this;
 	}
 
 	@SuppressWarnings("static-method")
-	public short getChargedMetaData(ItemStack aStack) {
+	public short getEmptyMetaData(final ItemStack aStack) {
 		return (short) aStack.getItemDamage();
 	}
 
-	@SuppressWarnings("static-method")
-	public short getEmptyMetaData(ItemStack aStack) {
-		return (short) aStack.getItemDamage();
+	@Override
+	public final IIcon getIconFromDamage(final int aMetaData) {
+		if (aMetaData < 0) {
+			return null;
+		}
+		return aMetaData - this.mOffset < this.mIconList.length ? this.mIconList[aMetaData - this.mOffset][0] : null;
 	}
 
+	@Override
+	public boolean getIsRepairable(final ItemStack aStack, final ItemStack aMaterial) {
+		return false;
+	}
 
-	public boolean isItemStackUsable(ItemStack aStack) {
-		ArrayList<IItemBehaviour<BaseEuItem>> tList = mItemBehaviors.get((short) getDamage(aStack));
-		if (tList != null) for (IItemBehaviour<BaseEuItem> tBehavior : tList)
-			if (!tBehavior.isItemStackUsable(this, aStack)) return false;
-		return true;
+	@Override
+	public int getItemEnchantability() {
+		return 0;
 	}
 
 	@Override
-	public final String getToolTip(ItemStack aStack) {
-		return null;
-	} // This has its own ToolTip Handler, no need to let the IC2 Handler screw us up at this Point
+	public String getItemStackDisplayName(final ItemStack par1ItemStack) {
+		return this.itemName.get(par1ItemStack.getItemDamage() - this.mOffset).getValue();
+	}
 
 	@Override
-	public final IElectricItemManager getManager(ItemStack aStack) {
+	public final IElectricItemManager getManager(final ItemStack aStack) {
 		return this;
 	} // We are our own Manager
 
-	/**
-	 * Sets the Furnace Burn Value for the Item.
-	 *
-	 * @param aMetaValue the Meta Value of the Item you want to set it to. [0 - 32765]
-	 * @param aValue     200 = 1 Burn Process = 500 EU, max = 32767 (that is 81917.5 EU)
-	 * @return the Item itself for convenience in constructing.
-	 */
-	public final BaseEuItem setBurnValue(int aMetaValue, int aValue) {
-		if (aMetaValue < 0 || aValue < 0) return this;
-		if (aValue == 0) mBurnValues.remove((short) aMetaValue);
-		else mBurnValues.put((short) aMetaValue, aValue > Short.MAX_VALUE ? Short.MAX_VALUE : (short) aValue);
-		return this;
+	@Override
+	public final double getMaxCharge(final ItemStack aStack) {
+		final Long[] tStats = this.getElectricStats(aStack);
+		if (tStats == null) {
+			return 0;
+		}
+		return Math.abs(tStats[0]);
 	}
 
-	/**
-	 * @param aMetaValue     the Meta Value of the Item you want to set it to. [0 - 32765]
-	 * @param aMaxCharge     Maximum Charge. (if this is == 0 it will remove the Electric Behavior)
-	 * @param aTransferLimit Transfer Limit.
-	 * @param aTier          The electric Tier.
-	 * @param aSpecialData   If this Item has a Fixed Charge, like a SingleUse Battery (if > 0).
-	 *                       Use -1 if you want to make this Battery chargeable (the use and canUse Functions will still discharge if you just use this)
-	 *                       Use -2 if you want to make this Battery dischargeable.
-	 *                       Use -3 if you want to make this Battery charge/discharge-able.
-	 * @return the Item itself for convenience in constructing.
-	 */
-	public final BaseEuItem setElectricStats(int aMetaValue, long aMaxCharge, long aTransferLimit, long aTier, long aSpecialData, boolean aUseAnimations) {
-		if (aMetaValue < 0) return this;
-		if (aMaxCharge == 0) mElectricStats.remove((short) aMetaValue);
-		else {
-			mElectricStats.put((short) aMetaValue, new Long[]{aMaxCharge, Math.max(0, aTransferLimit), Math.max(-1, aTier), aSpecialData});           
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(final ItemStack par1ItemStack) {
+		if (this.rarity.get(par1ItemStack.getItemDamage() - this.mOffset) != null) {
+			return this.rarity.get(par1ItemStack.getItemDamage() - thi