Merge pull request #32 from dshadowwolf/master-1.11.2-dev

Final cleanup in prep for release

Author: jriwanek

src/main/java/com/mcmoddev/nethermetals/init/Recipes.java

@@ -86,10 +86,10 @@ private static void recipeWrapper(boolean enabled, MMDMaterial material) {
 		if (enabled) {
 			if (material != null) {
 				if (material.getBlock(Names.NETHERORE) != null) {
-					boolean makeDusts = false;
-					boolean smeltToIngots = false;
+					boolean makeDusts = Options.makeDusts;
+					boolean smeltToIngots = Options.smeltToIngots;
 					if (Options.enableFurnaceSmelting) {
-						if (smeltToIngots == true) {
+						if (smeltToIngots) {
 							if (material.getItem(Names.INGOT) != null) {
 								GameRegistry.addSmelting(material.getBlock(Names.NETHERORE), new ItemStack(material.getItem(Names.INGOT), 2), 1.0f);
 							} else {
@@ -103,7 +103,7 @@ private static void recipeWrapper(boolean enabled, MMDMaterial material) {
 							}
 						}
 					}
-					if (makeDusts == true) {
+					if (makeDusts) {
 						if (material.getItem(Names.POWDER) != null) {
 						CrusherRecipeRegistry.addNewCrusherRecipe(material.getBlock(Names.NETHERORE), new ItemStack(material.getItem(Names.POWDER), 4));
 						} else {

src/main/java/com/mcmoddev/nethermetals/util/Config.java

@@ -47,7 +47,9 @@ public static void init() {
 		Options.enableFurnaceSmelting = configuration.getBoolean("enableFurnaceSmelting", GENERAL, true, "EnableFurnaceSmelting");
 		Options.explosionChance = configuration.get("mean", "OreExplosionChance", 2, "Explosion Percentage Chance\nSet to 0 to not explode").getInt();
 		Options.angerPigmenRange = configuration.get("mean", "PigmenAngerRange", 20, "Anger Pigmen Range\nRequires PigmenAnger").getInt();
-
+		Options.smeltToIngots = configuration.getBoolean("smeltToIngots", GENERAL, false, "By default nether ores smelt to 2 standard ores - with this option you get 2 ingots");
+		Options.makeDusts = configuration.getBoolean("makeDusts", GENERAL, false, "Normally hitting a Nether Ore with a Crackhammer gives you 2 normal ores. With this option you get 4 dusts");
+		
 		//Nether Ores
 		Options.enableCoalNetherOre = configuration.getBoolean("enableCoalNetherOre", NETHERORE, true, "Enable Coal Nether Ore");
 		Options.enableDiamondNetherOre = configuration.getBoolean("enableDiamondNetherOre", NETHERORE, true, "Enable Diamond Nether Ore");
@@ -113,6 +115,8 @@ public static void init() {
 
 	public static class Options {
 
+		public static boolean makeDusts;
+		public static boolean smeltToIngots;
 		public static boolean requireMMDLib = false;
 		public static boolean requireMMDOreSpawn = true;
 		public static boolean enableTinkersConstruct = false;