Merge pull request #193 from Thorfusion/continue-efr-support

Continue efr support

src/main/java/mekanism/common/Mekanism.java

@@ -1034,9 +1034,11 @@ public class Mekanism
 		}
 
 		//Combiner recipes
-		RecipeHandler.addCombinerRecipe(new ItemStack(Items.redstone, 16), new ItemStack(Blocks.redstone_ore));
-		RecipeHandler.addCombinerRecipe(new ItemStack(Items.dye, 16, 4), new ItemStack(Blocks.lapis_ore));
-		RecipeHandler.addCombinerRecipe(new ItemStack(Items.flint), new ItemStack(Blocks.gravel));
+		if (MekanismConfig.recipes.enableCombiner) {
+			RecipeHandler.addCombinerRecipe(new ItemStack(Items.redstone, 16), new ItemStack(Blocks.redstone_ore));
+			RecipeHandler.addCombinerRecipe(new ItemStack(Items.dye, 16, 4), new ItemStack(Blocks.lapis_ore));
+			RecipeHandler.addCombinerRecipe(new ItemStack(Items.flint), new ItemStack(Blocks.gravel));
+		}
 
 		//Osmium Compressor Recipes
 		RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(MekanismItems.Ingot, 1, 3));

src/main/java/mekanism/common/integration/OreDictManager.java

@@ -118,7 +118,7 @@ public final class OreDictManager
 				RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, resource.ordinal()));
 			}
 
-			if (!Mekanism.hooks.EFRLoaded) {
+			if (!Mekanism.hooks.EFRLoaded && MekanismConfig.recipes.enableCombiner) {
 				try {
 					for (ItemStack ore : OreDictionary.getOres("dust" + resource.getOredictName())) {
 						RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), StackUtils.size(OreDictionary.getOres("ore" + resource.getOredictName()).get(0), 1));
@@ -247,7 +247,7 @@ public final class OreDictManager
 					} catch (Exception e) {
 					}
 				}
-				if (!Mekanism.hooks.EFRLoaded) {
+				if (!Mekanism.hooks.EFRLoaded && MekanismConfig.recipes.enableCombiner) {
 					for (ItemStack ore : OreDictionary.getOres("dust" + s)) {
 						try {
 							RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), StackUtils.size(OreDictionary.getOres("ore" + s).get(0), 1));
@@ -392,7 +392,9 @@ public final class OreDictManager
 		
 		for(ItemStack ore : OreDictionary.getOres("dustObsidian"))
 		{
-			RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 4), new ItemStack(Blocks.obsidian));
+			if (MekanismConfig.recipes.enableCombiner) {
+				RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 4), new ItemStack(Blocks.obsidian));
+			}
 			RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("DIAMOND"), 10, StackUtils.size(ore, 1), new ItemStack(MekanismItems.OtherDust, 1, 5));
 		}
 		
@@ -535,6 +537,31 @@ public final class OreDictManager
 					RecipeHelper.addPurificationChamberRecipe(ore, ore2);
 				}
 			}
+			for (ItemStack ore : OreDictionary.getOres("rawPoorIron")) {
+				for (ItemStack ore2 : OreDictionary.getOres("clumpIron")) {
+					RecipeHelper.addPurificationChamberRecipe(ore, ore2);
+				}
+			}
+			for (ItemStack ore : OreDictionary.getOres("rawPoorGold")) {
+				for (ItemStack ore2 : OreDictionary.getOres("clumpGold")) {
+					RecipeHelper.addPurificationChamberRecipe(ore, ore2);
+				}
+			}
+			for (ItemStack ore : OreDictionary.getOres("rawPoorCopper")) {
+				for (ItemStack ore2 : OreDictionary.getOres("clumpCopper")) {
+					RecipeHelper.addPurificationChamberRecipe(ore, ore2);
+				}
+			}
+			for (ItemStack ore : OreDictionary.getOres("rawPoorTin")) {
+				for (ItemStack ore2 : OreDictionary.getOres("clumpTin")) {
+					RecipeHelper.addPurificationChamberRecipe(ore, ore2);
+				}
+			}
+			for (ItemStack ore : OreDictionary.getOres("rawPoorLead")) {
+				for (ItemStack ore2 : OreDictionary.getOres("clumpLead")) {
+					RecipeHelper.addPurificationChamberRecipe(ore, ore2);
+				}
+			}
 		}
 	}
 }

src/main/resources/assets/mekanism/lang/en_US.lang

@@ -899,6 +899,9 @@ tooltip.ReactorLogicAdapter=A block that can be used to allow basic monitoring o
 tooltip.OsmiumOre=A strong mineral that can be found at nearly any height in the world. It is known to have many uses in the construction of machinery.
 tooltip.CopperOre=A common, conductive material that can be used in the production of wires. Its ability to withstand high heats also makes it essential to advanced machinery.
 tooltip.TinOre=A lightweight, yet sturdy, conductive material that is found slightly less commonly than Copper.
+tooltip.tile.DeepslateOreBlock.OsmiumOre=A strong mineral that can be found at nearly any height in the world. It is known to have many uses in the construction of machinery.
+tooltip.tile.DeepslateOreBlock.CopperOre=A common, conductive material that can be used in the production of wires. Its ability to withstand high heats also makes it essential to advanced machinery.
+tooltip.tile.DeepslateOreBlock.TinOre=A lightweight, yet sturdy, conductive material that is found slightly less commonly than Copper.
 
 //Side data
 sideData.None=None