diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index b40823f82..6c2015936 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -75,6 +75,7 @@ public class MekanismConfig public static boolean enableoregen; public static boolean enableBoPProgression; + public static boolean enabledeepslateosmium; public static boolean EnableQuartzCompat; public static boolean EnableDiamondCompat; public static boolean EnablePoorOresCompat; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 22fdbe43f..bd7ca9635 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -263,6 +263,7 @@ public class CommonProxy implements IGuiProvider general.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt(); general.UPDATE_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ClientUpdateDelay", 10).getInt(); general.osmiumPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OsmiumPerChunk", 12).getInt(); + mekce.enabledeepslateosmium = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DeepslateOsmiumPerChunk", true, "adds deepslate osmium ore if et futurum requiem is present").getBoolean(); general.copperPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CopperPerChunk", 16).getInt(); general.tinPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "TinPerChunk", 14).getInt(); general.saltPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SaltPerChunk", 2).getInt(); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 35a5739bf..6c0503fda 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -988,6 +988,7 @@ public class Mekanism FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 0), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F); FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 5), 1.0F); FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 6), 1.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 3), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F); FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 1), 0.0F); FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal()), new ItemStack(Items.iron_ingot), 0.0F); FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal()), new ItemStack(Items.gold_ingot), 0.0F); @@ -1280,6 +1281,8 @@ public class Mekanism OreDictionary.registerOre("ore" + mekanismMaterial, new ItemStack(MekanismBlocks.OreBlock, 1, 0)); OreDictionary.registerOre("oreCopper", new ItemStack(MekanismBlocks.OreBlock, 1, 1)); OreDictionary.registerOre("oreTin", new ItemStack(MekanismBlocks.OreBlock, 1, 2)); + OreDictionary.registerOre("ore" + mekanismMaterial, new ItemStack(MekanismBlocks.OreBlock, 1, 3)); + OreDictionary.registerOre("oreDeepslateOsmium", new ItemStack(MekanismBlocks.OreBlock, 1, 3)); if(general.controlCircuitOreDict) { diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index d8679fa69..624613f3a 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -18,6 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; * 0: Osmium Ore * 1: Copper Ore * 2: Tin Ore + * 3: Deepslate Osmium Ore * @author AidanBrady * */ @@ -40,6 +41,7 @@ public class BlockOre extends Block icons[0] = register.registerIcon("mekanism:OsmiumOre"); icons[1] = register.registerIcon("mekanism:CopperOre"); icons[2] = register.registerIcon("mekanism:TinOre"); + icons[3] = register.registerIcon("mekanism:DeepslateOsmiumOre"); } @Override @@ -62,5 +64,6 @@ public class BlockOre extends Block list.add(new ItemStack(item, 1, 0)); list.add(new ItemStack(item, 1, 1)); list.add(new ItemStack(item, 1, 2)); + list.add(new ItemStack(item, 1, 3)); } } diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 54cf920a5..eb1271999 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -12,6 +12,7 @@ import java.util.Map; import li.cil.oc.api.Driver; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.Resource; import mekanism.common.multipart.TransmitterType; @@ -24,6 +25,8 @@ import cpw.mods.fml.common.Loader; 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 mekanism.api.MekanismConfig.mekce; /** * Hooks for Mekanism. Use to grab items or blocks out of different mods. @@ -41,6 +44,7 @@ public final class MekanismHooks public boolean CCLoaded = false; public boolean AE2Loaded = false; public boolean RRLoaded = false; + public boolean EFRLoaded = false; public void hook() { @@ -51,6 +55,12 @@ public final class MekanismHooks if(Loader.isModLoaded("ComputerCraft")) CCLoaded = true; if(Loader.isModLoaded("appliedenergistics2")) AE2Loaded = true; if(Loader.isModLoaded("RefinedRelocation")) RRLoaded = true; + if(Loader.isModLoaded("etfuturum")) EFRLoaded = true; + + if(EFRLoaded && mekce.enabledeepslateosmium){ + hookEFRRecipes(); + Mekanism.logger.info("Hooked into EFR api successfully."); + } if(IC2Loaded) { @@ -63,9 +73,14 @@ public final class MekanismHooks loadCCPeripheralProviders(); } + } + @Method(modid = "etfuturum") + public void hookEFRRecipes() { + DeepslateOreRegistry.addOre(MekanismBlocks.OreBlock, 0, MekanismBlocks.OreBlock, 3); + } @Method(modid = "IC2") public void hookIC2Recipes() { diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 7a4e0affb..d7812a2a1 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -76,6 +76,9 @@ public class ItemBlockOre extends ItemBlock case 2: name = "TinOre"; break; + case 3: + name = "DeepslateOsmiumOre"; + break; default: name = "Unknown"; break; diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 1516f11b9..73474e926 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -185,6 +185,7 @@ infuse.lead=Lead tile.OreBlock.OsmiumOre.name=Osmium Ore tile.OreBlock.CopperOre.name=Copper Ore tile.OreBlock.TinOre.name=Tin Ore +tile.OreBlock.DeepslateOsmiumOre.name=Deepslate Osmium Ore //Transmitters item.MultipartTransmitter.BasicPressurizedTube.name=Basic Pressurized Tube