Merge pull request #415 from hilburn/1.7-update

fixes dirty colonial spelling of aluminium
iopleke · Nov 8, 2014 · d37f6ef · d37f6ef
2 parents fb80848 + ea444a1
commit d37f6ef
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/minechem/MinechemRecipes.java b/src/main/java/minechem/MinechemRecipes.java
@@ -2844,7 +2844,7 @@ public void RegisterModRecipes()
 		if (Loader.isModLoaded("appliedenergistics2"))
 		{
 			MoleculeEnum certusQuartzMolecule = MoleculeEnum.aluminiumPhosphate;
-			MoleculeEnum chargedCertusQuartzMolecule = MoleculeEnum.aluminumHypophosphite;
+			MoleculeEnum chargedCertusQuartzMolecule = MoleculeEnum.aluminiumHypophosphite;
 			PotionChemical chargedCertusQuartzChemical = new Molecule(chargedCertusQuartzMolecule);
 
 			PotionChemical[] chargedCertusQuartzDecompositionFormula = new PotionChemical[]

diff --git a/src/main/java/minechem/fluid/FluidElement.java b/src/main/java/minechem/fluid/FluidElement.java
@@ -5,6 +5,7 @@
 import minechem.item.MinechemChemicalType;
 import minechem.item.element.ElementEnum;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
 public class FluidElement extends MinechemFluid
 {
@@ -31,6 +32,12 @@ public MinechemChemicalType getChemical()
         return element;
     }
 
+	@Override
+	public int getColor(FluidStack stack)
+	{
+		return stack.getFluid().getColor();
+	}
+
     @Override
 	public int getColor()
 	{

diff --git a/src/main/java/minechem/item/element/ElementItem.java b/src/main/java/minechem/item/element/ElementItem.java
@@ -79,7 +79,8 @@ public static String getLongName(ItemStack itemstack)
         String longName = atomicNumber < ElementEnum.heaviestMass ? MinechemHelper.getLocalString(ElementEnum.getByID(atomicNumber).getUnlocalizedName()) : MinechemHelper.getLocalString("element.empty");
         if (longName.contains("Element."))
         {
-            longName = ElementEnum.getByID(atomicNumber).getLongName();
+            ElementEnum element = ElementEnum.getByID(atomicNumber);
+            if (element!=null) longName=element.getLongName();
         }
         return longName;
     }

diff --git a/src/main/java/minechem/item/molecule/MoleculeEnum.java b/src/main/java/minechem/item/molecule/MoleculeEnum.java
@@ -227,7 +227,7 @@ public class MoleculeEnum extends MinechemChemicalType
 
 	// AE2
 	public static final MoleculeEnum hypophosphite = addMolecule("hypophosphite", 154, solid, new Element(H, 2), new Element(P, 1), new Element(O, 2));
-	public static final MoleculeEnum aluminumHypophosphite = addMolecule("aluminumHypophosphite", 155, solid, new Element(Al, 1), new Molecule(hypophosphite, 3));
+	public static final MoleculeEnum aluminiumHypophosphite = addMolecule("aluminiumHypophosphite", 155, solid, new Element(Al, 1), new Molecule(hypophosphite, 3));
 
 	// More things for Underground Biomes
 	public static final MoleculeEnum omphacite = addMolecule("omphacite", 156, solid, new Element(Ca, 1), new Element(Al, 1), new Element(Si, 2), new Element(O, 6));

diff --git a/src/main/java/minechem/oredictionary/OreDictionaryAppliedEnergisticsHandler.java b/src/main/java/minechem/oredictionary/OreDictionaryAppliedEnergisticsHandler.java
@@ -14,7 +14,7 @@ public class OreDictionaryAppliedEnergisticsHandler implements OreDictionaryHand
 
 	private PotionChemical certusQuartzChemical = new Molecule(certusQuartzMolecule);
 
-	private MoleculeEnum chargedCertusQuartzMolecule = MoleculeEnum.aluminumHypophosphite;
+	private MoleculeEnum chargedCertusQuartzMolecule = MoleculeEnum.aluminiumHypophosphite;
 
 	private PotionChemical chargedCertusQuartzChemical = new Molecule(chargedCertusQuartzMolecule);
 

diff --git a/src/main/resources/assets/minechem/lang/en_US.lang b/src/main/resources/assets/minechem/lang/en_US.lang
@@ -478,7 +478,7 @@ molecule.rubidiumHydroxide=Rubidium Hydroxide
 molecule.cesiumHydroxide=Cesium Hydroxide
 molecule.franciumHydroxide=Francium Hydroxide
 molecule.hypophosphite=Hypophosphite
-molecule.aluminumHypophosphite=Aluminum Hypophosphite
+molecule.aluminiumHypophosphite=Aluminium Hypophosphite
 molecule.omphacite=Omphacite
 molecule.silicate=Silicate
 molecule.pyrope=Pyrope