Merge pull request #188 from Thorfusion/add-further-efr-support

Add further efr support

gradle.properties

@@ -4,5 +4,5 @@ FMP_version=1.2.0.345
 CCLIB_version=1.1.3.141
 NEI_version=1.0.5.120
 CCC_version=1.0.7.48
-mod_version=9.10.39
-alt_version=9, 10, 39
+mod_version=9.10.40
+alt_version=9, 10, 40

src/main/java/mekanism/api/MekanismConfig.java

@@ -196,6 +196,7 @@ public class MekanismConfig
 	public static class recipes
 	{
 		public static boolean enableOsmiumBlock = true;
+		public static boolean enableRawOsmiumBlock = true;
 		public static boolean enableBronzeBlock = true;
 		public static boolean enableRefinedObsidianBlock = true;
 		public static boolean enableCharcoalBlock = true;

src/main/java/mekanism/common/CommonProxy.java

@@ -412,6 +412,7 @@ public class CommonProxy implements IGuiProvider
 		Tier.loadConfig();
 
 		recipes.enableOsmiumBlock = Mekanism.configurationrecipes.get("recipes","enableOsmiumBlock", true).getBoolean();
+		recipes.enableRawOsmiumBlock = Mekanism.configurationrecipes.get("recipes","enableRawOsmiumBlock", true).getBoolean();
 		recipes.enableBronzeBlock = Mekanism.configurationrecipes.get("recipes","enableBronzeBlock", true).getBoolean();
 		recipes.enableRefinedObsidianBlock = Mekanism.configurationrecipes.get("recipes","enableRefinedObsidianBlock", true).getBoolean();
 		recipes.enableCharcoalBlock = Mekanism.configurationrecipes.get("recipes","enableCharcoalBlock", true).getBoolean();

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

@@ -127,7 +127,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
  */
 @Mod(modid = "Mekanism", name = "Mekanism", version = "GRADLE_MODVERSION", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
 		dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
-				"after:ComputerCraft;after:Galacticraft;after:MineTweaker3")
+				"after:ComputerCraft;after:Galacticraft;after:MineTweaker3;after:etfuturum")
 public class Mekanism
 {
 	/** Mekanism Packet Pipeline */
@@ -249,6 +249,12 @@ public class Mekanism
 			}));
 		}
 
+		if (MekanismConfig.recipes.enableRawOsmiumBlock){
+			CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.RawOsmiumOre, 9, 1), new Object[]{
+					"*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 10)
+			}));
+		}
+
 		if (MekanismConfig.recipes.enableBronzeBlock) {
 			CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 1), new Object[]{
 					"***", "***", "***", Character.valueOf('*'), "ingotBronze"
@@ -997,6 +1003,7 @@ public class Mekanism
 		FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.OtherDust, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 4), 0.0F);
 		FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.COPPER.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 5), 0.0F);
 		FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.TIN.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F);
+		FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.RawOsmiumOre), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F);
 
 		//Enrichment Chamber Recipes
 		RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 12));
@@ -1230,6 +1237,8 @@ public class Mekanism
 		OreDictionary.registerOre("pulpWood", MekanismItems.Sawdust);
 		OreDictionary.registerOre("dustWood", MekanismItems.Sawdust);
 		OreDictionary.registerOre("blockSalt", MekanismBlocks.SaltBlock);
+		OreDictionary.registerOre("rawOsmium", MekanismItems.RawOsmiumOre);
+		OreDictionary.registerOre("oreOsmium", MekanismItems.RawOsmiumOre);
 
 
 		//Alloys!
@@ -1263,6 +1272,7 @@ public class Mekanism
 		OreDictionary.registerOre("ingotRefinedLapis", new ItemStack(MekanismItems.Ingot, 1, 7));
 
 		OreDictionary.registerOre("block" + mekanismMaterial, new ItemStack(MekanismBlocks.BasicBlock, 1, 0));
+		OreDictionary.registerOre("blockRawOsmium", new ItemStack(MekanismBlocks.BasicBlock2, 1, 10));
 		OreDictionary.registerOre("blockBronze", new ItemStack(MekanismBlocks.BasicBlock, 1, 1));
 		OreDictionary.registerOre("blockRefinedObsidian", new ItemStack(MekanismBlocks.BasicBlock, 1, 2));
 		OreDictionary.registerOre("blockCharcoal", new ItemStack(MekanismBlocks.BasicBlock, 1, 3));

src/main/java/mekanism/common/MekanismItems.java

@@ -63,6 +63,7 @@ public class MekanismItems
 	public static final ItemJetpack ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack");
 	public static final ItemFreeRunners FreeRunners = (ItemFreeRunners)new ItemFreeRunners().setUnlocalizedName("FreeRunners");
 	public static final Item Balloon = new ItemBalloon().setUnlocalizedName("Balloon");
+	public static final Item RawOsmiumOre = new ItemMekanism().setUnlocalizedName("RawOsmiumOre");
 
 	//Multi-ID Items
 	public static final Item OtherDust = new ItemOtherDust();
@@ -141,6 +142,7 @@ public class MekanismItems
 		GameRegistry.registerItem(GaugeDropper, "GaugeDropper");
 		GameRegistry.registerItem(TierInstaller, "FactoryInstaller");
 		GameRegistry.registerItem(OtherDust, "OtherDust");
+		GameRegistry.registerItem(RawOsmiumOre, "RawOsmiumOre");
 
 		FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET);
 		FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("lithium"), new ItemStack(LithiumBucket), FluidContainerRegistry.EMPTY_BUCKET);

src/main/java/mekanism/common/block/BlockBasic.java

@@ -100,6 +100,7 @@ import cpw.mods.fml.relauncher.SideOnly;
  * 1:7: Boiler Casing
  * 1:8: Boiler Valve
  * 1:9: Security Desk
+ * 1:10: Raw Osmium Block
  * @author AidanBrady
  *
  */
@@ -258,6 +259,8 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
 				icons[8][0] = ctms[8][0].mainTextureData.icon;
 				
 				icons[9][0] = register.registerIcon(ICON_BASE);
+
+				icons[10][0] = register.registerIcon("mekanism:RawOsmiumBlock");
 				
 				break;
 		}
@@ -1130,7 +1133,8 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon
 		PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser", TileEntityPressureDisperser.class, true),
 		BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true),
 		BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true),
-		SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true);
+		SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true),
+		RAW_OSMIUM_BLOCK(BasicBlock.BASIC_BLOCK_2, 10, "RawOsmiumBlock", null, false);
 		
 		public BasicBlock typeBlock;
 		public int meta;

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

@@ -26,6 +26,7 @@ import cpw.mods.fml.common.Optional.Method;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import dan200.computercraft.api.ComputerCraftAPI;
 import ganymedes01.etfuturum.api.DeepslateOreRegistry;
+import ganymedes01.etfuturum.api.RawOreRegistry;
 import mekanism.api.MekanismConfig.mekce;
 
 /**
@@ -80,6 +81,7 @@ public final class MekanismHooks
 	@Method(modid = "etfuturum")
 	public void hookEFRRecipes() {
 		DeepslateOreRegistry.addOre(MekanismBlocks.OreBlock, 0, MekanismBlocks.DeepslateOreBlock, 0);
+		RawOreRegistry.addOre("oreOsmium", MekanismItems.RawOsmiumOre);
 	}
 	@Method(modid = "IC2")
 	public void hookIC2Recipes()

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

@@ -123,6 +123,11 @@ public final class OreDictManager
 					"XXX", "XXX", "XXX", Character.valueOf('X'), "ingot" + mekanismMaterial
 			}));
 		}
+		if (MekanismConfig.recipes.enableRawOsmiumBlock) {
+			CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 10), new Object[]{
+					"XXX", "XXX", "XXX", Character.valueOf('X'), "raw" + mekanismMaterial
+			}));
+		}
 		if (MekanismConfig.recipes.enableMachineUpgrades) {
 			CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.SpeedUpgrade), new Object[]{
 					" G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dust" + mekanismMaterial

src/main/java/mekanism/common/network/PacketConfigSync.java

@@ -120,6 +120,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			dataStream.writeDouble(usage.heavyWaterElectrolysisUsage);
 			dataStream.writeDouble(usage.formulaicAssemblicatorUsage);
 			dataStream.writeBoolean(recipes.enableOsmiumBlock);
+			dataStream.writeBoolean(recipes.enableRawOsmiumBlock);
 			dataStream.writeBoolean(recipes.enableBronzeBlock);
 			dataStream.writeBoolean(recipes.enableRefinedObsidianBlock);
 			dataStream.writeBoolean(recipes.enableCharcoalBlock);
@@ -319,6 +320,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			usage.heavyWaterElectrolysisUsage = dataStream.readDouble();
 			usage.formulaicAssemblicatorUsage = dataStream.readDouble();
 			recipes.enableOsmiumBlock = dataStream.readBoolean();
+			recipes.enableRawOsmiumBlock = dataStream.readBoolean();
 			recipes.enableBronzeBlock = dataStream.readBoolean();
 			recipes.enableRefinedObsidianBlock = dataStream.readBoolean();
 			recipes.enableCharcoalBlock = dataStream.readBoolean();

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

@@ -51,6 +51,7 @@ item.Flamethrower.name=Flamethrower
 item.GaugeDropper.name=Gauge Dropper
 item.BioFuel.name=Biomass
 item.CraftingFormula.name=Crafting Formula
+item.RawOsmiumOre.name=Raw Osmium
 
 //Control Circuits
 item.BasicControlCircuit.name=Basic Control Circuit
@@ -117,6 +118,7 @@ tile.BasicBlock2.PressureDisperser.name=Pressure Disperser
 tile.BasicBlock2.BoilerCasing.name=Boiler Casing
 tile.BasicBlock2.BoilerValve.name=Boiler Valve
 tile.BasicBlock2.SecurityDesk.name=Security Desk
+tile.BasicBlock2.RawOsmiumBlock.name=Raw Osmium Block
 
 //Machine Block
 tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber