Merge pull request #321 from way2muchnoise/1.7-update

adds molecules to the oreDict
iopleke · Oct 22, 2014 · 0200de6 · 0200de6
2 parents 23df512 + 91b4b7d
commit 0200de6
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/main/java/minechem/MinechemItemsRegistration.java b/src/main/java/minechem/MinechemItemsRegistration.java
@@ -85,15 +85,17 @@ private static void registerFluidContainers()
 
 	public static void registerToOreDictionary()
 	{
-		for (ElementEnum element : ElementEnum.elements.values())
-		{
-			if (element != null)
-			{
-				OreDictionary.registerOre("element_" + element.name(), new ItemStack(MinechemItemsRegistration.element, 1, element.ordinal()));
-			}
-		}
+        for (ElementEnum element : ElementEnum.elements.values())
+        {
+            OreDictionary.registerOre("element_" + element.name(), new ItemStack(MinechemItemsRegistration.element, 1, element.ordinal()));
+        }
+        for (MoleculeEnum molecule : MoleculeEnum.molecules.values())
+        {
+            OreDictionary.registerOre("molecule_" + molecule.name(), new ItemStack(MinechemItemsRegistration.molecule, 1, molecule.id()));
+        }
 		OreDictionary.registerOre("dustSaltpeter", new ItemStack(MinechemItemsRegistration.molecule, 1, MoleculeEnum.potassiumNitrate.id()));
 		OreDictionary.registerOre("dustSalt", new ItemStack(MinechemItemsRegistration.molecule, 1, MoleculeEnum.salt.id()));
 		OreDictionary.registerOre("quicksilver", new ItemStack(MinechemItemsRegistration.element, 1, ElementEnum.Hg.ordinal()));
 	}
+
 }