+ Added recipes to obtain Astral Titanium, Celestial Tungsten Advanced Nitinol and Chromatic Glass.

+ Added Particle Physics, so some basic extent.
+ Added new textures for some Meta items.
+ Added new textures for all particles and ions.
+ Added Custom Debug NBT to error ingots, in the event one is obtained by a player.
+ Added more information to the tooltip of Control Cores.
+ Added more uniform ways to obtain tiered item components to CI.
- Hard disable of GC Fuel tweaks for the moment.
% Hopefully greatly improved the cape handler. Cape list is now stored on Overmind's site, meaning it can be updated outside of the mod.
% Cape Handler now will store the cape data locally in a .dat for offline use, this can be updated anytime by removing it, or once a week if outdated)
% Tweaked Cyclotron Recipe map to support new changes to functionality.
% Tweaked RTG fuel pellet production time in Cyclotron to be 100x.
% Adjusted requirements for Quicklime to generate (It may vanish after this commit, May be worth rolling back if an issue.).
% Adjusted code to use checkForInvalidItems instead of direct item comparisons in several places.
% Renamed Buffer Cores to Energy Cores.
% Adjusted recipes for Energy Cores and Energy Buffers, they now require 6 slot assembly.
$ Fixed Multiblock handling during structure checks, they'd accidentally detect the controller as an invalid block.

3 files changed, 205 insertions, 4 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
index ff5f67d2da..517a698e80 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
@@ -1,23 +1,42 @@
 package gtPlusPlus.core.item.chemistry;
 
+import java.util.HashMap;
+import java.util.List;
+
 import gregtech.api.enums.Materials;
 import gtPlusPlus.core.item.base.misc.BaseItemParticle;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
 
 public class IonParticles extends BaseItemParticle {
 
+	public static HashMap<String, Integer> NameToMetaMap = new HashMap<String, Integer>();
+	public static HashMap<Integer, String> MetaToNameMap = new HashMap<Integer, String>();
+	
+	
 	public IonParticles() {
 		super("Ion", aElements.length, EnumRarity.rare);
 	}
 	
 	private static final String[] aElements = new String[]{"Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminum", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Cesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
+
+	public static IIcon[] overlays = new IIcon[aElements.length];
+	public static IIcon baseTexture;
 	
 	static {
 		//Generate Ions
 		int key = 0;
 		for (String s : aElements) {
+			//Map names to Meta
+			NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key);
+			MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
 			Materials m = Materials.get(s);
 			int aColour = 0;
 			if (m == null) {
@@ -45,5 +64,103 @@ public class IonParticles extends BaseItemParticle {
     public String getUnlocalizedName(final ItemStack itemStack) {
         return "item.particle.ion" + "." + aElements[itemStack.getItemDamage()];
     }
+	
+	private static boolean createNBT(ItemStack rStack){
+		final NBTTagCompound tagMain = new NBTTagCompound();
+		final NBTTagCompound tagNBT = new NBTTagCompound();
+		tagNBT.setLong("Charge", 0);
+		tagMain.setTag("Ion", tagNBT);		
+		rStack.setTagCompound(tagMain);		
+		return true;
+	}
+	
+	public static final long getChargeState(final ItemStack aStack) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("Ion");
+			if (aNBT != null) {
+				return aNBT.getLong("Charge");
+			}
+		}
+		else {
+		createNBT(aStack);
+		}
+		return 0L;
+	}
+
+	public static final boolean setChargeState(final ItemStack aStack, final long aCharge) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("Ion");
+			if (aNBT != null) {
+				aNBT.setLong("Charge", aCharge);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		if (stack.getTagCompound() == null){
+			createNBT(stack);
+        }
+		double chargeState = getChargeState(stack);	
+        return  chargeState;
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {		
+		long aCharge = getChargeState(stack);
+		String aState = EnumChatFormatting.YELLOW+"Unknown"+EnumChatFormatting.GRAY;		
+		//State not set
+		if (aCharge == 0) {
+			list.add(EnumChatFormatting.GRAY+"A "+MetaToNameMap.get(stack.getItemDamage())+" Ion with an "+aState+" charge state");			
+		}
+		else {
+			if (aCharge > 0) {
+				aState = EnumChatFormatting.GREEN+"Positive"+EnumChatFormatting.GRAY;
+			}
+			else {
+				aState = EnumChatFormatting.RED+"Negative"+EnumChatFormatting.GRAY;
+			}
+
+			list.add(EnumChatFormatting.GRAY+"A "+MetaToNameMap.get(stack.getItemDamage())+" Ion with a "+aState+" charge state of "+aCharge+"");	
+		}		
+		super.addInformation(stack, player, list, bool);
+	}
+	
+	@Override
+	public void registerIcons(IIconRegister reg) {		
+		for (int i = 0; i < IonParticles.overlays.length; i++) {
+			IonParticles.overlays[i] = reg.registerIcon(CORE.MODID + ":" + "ion/"+i);			
+		}
+		IonParticles.baseTexture = reg.registerIcon(CORE.MODID + ":" + "ion/IonBase");
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+		return IonParticles.overlays[meta];
+	}
+
+	@Override
+	public boolean requiresMultipleRenderPasses() {
+		return true;
+	}
+
+	@Override
+	public IIcon getIconFromDamageForRenderPass(int aMeta, int aPass) {
+		if (aPass == 0) {
+			return IonParticles.baseTexture;
+		}
+		else {
+			return IonParticles.overlays[aMeta];
+		}
+	}
+
+	@Override
+	public int getRenderPasses(int metadata) {
+		return 2;
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 9bd8a521ab..a516cb0639 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -404,7 +404,7 @@ public class RocketFuels {
 				480);	
 
 		ItemStack aCell11dimethylhydrazine = ItemUtils.getItemStackOfAmountFromOreDict("cell1,1Dimethylhydrazine", 2);
-		if (aCell11dimethylhydrazine != null && aCell11dimethylhydrazine.getItem() != ModItems.AAA_Broken) {
+		if (ItemUtils.checkForInvalidItems(aCell11dimethylhydrazine)) {
 			GT_Values.RA.addCentrifugeRecipe(
 					CI.getNumberedCircuit(23),
 					aCell11dimethylhydrazine,
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
index dd07d41b3d..1e833a7b00 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
@@ -1,15 +1,26 @@
 package gtPlusPlus.core.item.chemistry;
 
-import gregtech.api.enums.Materials;
+import java.util.HashMap;
+import java.util.List;
+
+import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.misc.BaseItemParticle;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Particle;
 import gtPlusPlus.core.material.Particle.ElementaryGroup;
 import gtPlusPlus.core.util.Utils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
 
 public class StandardBaseParticles extends BaseItemParticle {
 
+	public static HashMap<String, Integer> NameToMetaMap = new HashMap<String, Integer>();
+	public static HashMap<Integer, String> MetaToNameMap = new HashMap<Integer, String>();
+	
 	public StandardBaseParticles() {
 		super("Base", aTypes.length, EnumRarity.rare);
 	}
@@ -17,13 +28,19 @@ public class StandardBaseParticles extends BaseItemParticle {
 	private static final String[] aTypes = new String[] { "Graviton", "Up", "Down", "Charm", "Strange", "Top",
 			"Bottom", "Electron", "Electron Neutrino", "Muon", "Muon Neutrino", "Tau", "Tau Neutrino", "Gluon",
 			"Photon", "Z Boson", "W Boson", "Higgs Boson", "Proton", "Neutron", "Lambda", "Omega", "Pion",
-			"ETA Meson", };
+			"ETA Meson", "Unknown" };
+	
+	public IIcon[] icons = new IIcon[aTypes.length];
 	
 	static {
 		//Generate Ions
 		int key = 0;
+		
+		
 		for (String s : aTypes) {
-			Particle p;
+			//Map names to Meta
+			NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key);
+			MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
 			for (Particle o : Particle.aMap) {
 				int aColour = 0;
 				if (o.mParticleName.toLowerCase().equals(s.toLowerCase())) {
@@ -73,5 +90,72 @@ public class StandardBaseParticles extends BaseItemParticle {
     public String getUnlocalizedName(final ItemStack itemStack) {
         return "item.particle.base" + "." + aTypes[itemStack.getItemDamage()];
     }
+	
+	public static Particle getParticle(ItemStack aStack) {
+		AutoMap<Particle> g = Particle.aMap;
+		for (Particle p : g) {
+			String aPartName = Utils.sanitizeString(p.mParticleName.toLowerCase());
+			String expectedPart = Utils.sanitizeString(aTypes[aStack.getItemDamage()].toLowerCase());
+			if (aPartName.equals(expectedPart)) {
+				return p;
+			}
+		}
+		return Particle.UNKNOWN;	
+	}
+
+	@Override
+	public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
+		//return Utils.rgbtoHexValue(200, 200, 200);
+		return super.getColorFromParentClass(stack, HEX_OxFFFFFF);
+	}	
+	
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {		
+		Particle aCharge = getParticle(stack);
+		EnumChatFormatting aColour = EnumChatFormatting.GRAY;
+		String aState = aColour+"Unknown"+EnumChatFormatting.RESET;			
+		if (aCharge != null) {
+			String aGroup = aCharge.mParticleType.name().toLowerCase();
+			if (aGroup.toLowerCase().contains("quark")) {
+				aColour = EnumChatFormatting.LIGHT_PURPLE;
+			}
+			else if (aGroup.toLowerCase().contains("lepton")) {
+				aColour = EnumChatFormatting.GREEN;
+			}
+			else if (aCharge == Particle.HIGGS_BOSON) {
+				aColour = EnumChatFormatting.YELLOW;
+			}
+			else if (aGroup.toLowerCase().contains("boson")) {
+				aColour = EnumChatFormatting.RED;
+			}
+			else if (aGroup.toLowerCase().contains("baryon")) {
+				aColour = EnumChatFormatting.BLUE;
+			}
+			else if (aGroup.toLowerCase().contains("meson")) {
+				aColour = EnumChatFormatting.WHITE;
+			}
+			else {
+				aColour = EnumChatFormatting.GRAY;
+			}			
+			String aFirstLet = aGroup.substring(0, 1).toUpperCase();
+			aGroup = aGroup.replaceFirst(aGroup.substring(0, 1), aFirstLet);
+			aState = aColour+aGroup+EnumChatFormatting.RESET;
+			list.add(EnumChatFormatting.GRAY + "Type: "+aState);
+		}		
+		super.addInformation(stack, player, list, bool);
+	}
+
+	@Override
+	public void registerIcons(IIconRegister reg) {		
+		for (int i = 0; i < this.icons.length; i++) {
+			this.icons[i] = reg.registerIcon(CORE.MODID + ":" + "particle/"+i);			
+		}
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+		return this.icons[meta];
+	}
 
 }