Skip to content

Commit 0200de6

Browse files
committed
Merge pull request #321 from way2muchnoise/1.7-update
adds molecules to the oreDict
2 parents 23df512 + 91b4b7d commit 0200de6

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/main/java/minechem/MinechemItemsRegistration.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,17 @@ private static void registerFluidContainers()
8585

8686
public static void registerToOreDictionary()
8787
{
88-
for (ElementEnum element : ElementEnum.elements.values())
89-
{
90-
if (element != null)
91-
{
92-
OreDictionary.registerOre("element_" + element.name(), new ItemStack(MinechemItemsRegistration.element, 1, element.ordinal()));
93-
}
94-
}
88+
for (ElementEnum element : ElementEnum.elements.values())
89+
{
90+
OreDictionary.registerOre("element_" + element.name(), new ItemStack(MinechemItemsRegistration.element, 1, element.ordinal()));
91+
}
92+
for (MoleculeEnum molecule : MoleculeEnum.molecules.values())
93+
{
94+
OreDictionary.registerOre("molecule_" + molecule.name(), new ItemStack(MinechemItemsRegistration.molecule, 1, molecule.id()));
95+
}
9596
OreDictionary.registerOre("dustSaltpeter", new ItemStack(MinechemItemsRegistration.molecule, 1, MoleculeEnum.potassiumNitrate.id()));
9697
OreDictionary.registerOre("dustSalt", new ItemStack(MinechemItemsRegistration.molecule, 1, MoleculeEnum.salt.id()));
9798
OreDictionary.registerOre("quicksilver", new ItemStack(MinechemItemsRegistration.element, 1, ElementEnum.Hg.ordinal()));
9899
}
100+
99101
}

0 commit comments

Comments
 (0)