+ Added 118 Ions and all Base Particles.

+ Added localisation for over 600 of the new items added.
- Disabled custom GC Solar System.
% Moved registration of Fluorite Ore handler later.
% Fixed name of Radioactive Material Mix.
> Also includes changes made earlier, dunno.

2 files changed, 126 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
new file mode 100644
index 0000000000..ff5f67d2da
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/IonParticles.java
@@ -0,0 +1,49 @@
+package gtPlusPlus.core.item.chemistry;
+
+import gregtech.api.enums.Materials;
+import gtPlusPlus.core.item.base.misc.BaseItemParticle;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+
+public class IonParticles extends BaseItemParticle {
+
+	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"};
+	
+	static {
+		//Generate Ions
+		int key = 0;
+		for (String s : aElements) {
+			Materials m = Materials.get(s);
+			int aColour = 0;
+			if (m == null) {
+				aColour = Utils.rgbtoHexValue(128, 128, 128);
+			}
+			else {
+				aColour = Utils.rgbtoHexValue(m.mRGBa[0], m.mRGBa[1], m.mRGBa[2]);
+			}
+			aColourMap.put(key++, aColour);
+		}
+		
+	}
+
+	@Override
+	public String[] getAffixes() {
+		return new String[] {"", ""};
+	}
+
+	@Override
+	public String getUnlocalizedName() {
+		return "";
+	}
+	
+	@Override
+    public String getUnlocalizedName(final ItemStack itemStack) {
+        return "item.particle.ion" + "." + aElements[itemStack.getItemDamage()];
+    }
+
+}
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
new file mode 100644
index 0000000000..dd07d41b3d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
@@ -0,0 +1,77 @@
+package gtPlusPlus.core.item.chemistry;
+
+import gregtech.api.enums.Materials;
+import gtPlusPlus.core.item.base.misc.BaseItemParticle;
+import gtPlusPlus.core.material.Particle;
+import gtPlusPlus.core.material.Particle.ElementaryGroup;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+
+public class StandardBaseParticles extends BaseItemParticle {
+
+	public StandardBaseParticles() {
+		super("Base", aTypes.length, EnumRarity.rare);
+	}
+	
+	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", };
+	
+	static {
+		//Generate Ions
+		int key = 0;
+		for (String s : aTypes) {
+			Particle p;
+			for (Particle o : Particle.aMap) {
+				int aColour = 0;
+				if (o.mParticleName.toLowerCase().equals(s.toLowerCase())) {
+					if (o.mParticleType == ElementaryGroup.BARYON) {
+						aColour = Utils.rgbtoHexValue(174, 226, 156);			
+						aColourMap.put(key++, aColour);
+					}
+					else if (o.mParticleType == ElementaryGroup.BOSON) {
+						if (o == Particle.HIGGS_BOSON) {
+							aColour = Utils.rgbtoHexValue(226, 196, 104);			
+							aColourMap.put(key++, aColour);
+						}
+						else {
+							aColour = Utils.rgbtoHexValue(226, 52, 66);			
+							aColourMap.put(key++, aColour);
+						}						
+					}
+					else if (o.mParticleType == ElementaryGroup.LEPTON) {
+						aColour = Utils.rgbtoHexValue(126, 226, 95);			
+						aColourMap.put(key++, aColour);
+					}
+					else if (o.mParticleType == ElementaryGroup.MESON) {
+						aColour = Utils.rgbtoHexValue(90, 154, 226);			
+						aColourMap.put(key++, aColour);
+					}
+					else {
+						aColour = Utils.rgbtoHexValue(188, 61, 226);			
+						aColourMap.put(key++, aColour);
+					}
+				}
+			}
+		}
+		
+	}
+
+	@Override
+	public String[] getAffixes() {
+		return new String[] {"", ""};
+	}
+
+	@Override
+	public String getUnlocalizedName() {
+		return "";
+	}
+	
+	@Override
+    public String getUnlocalizedName(final ItemStack itemStack) {
+        return "item.particle.base" + "." + aTypes[itemStack.getItemDamage()];
+    }
+
+}