diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java b/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java index 7793e949..78eb951e 100644 --- a/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java +++ b/src/main/java/net/blay09/mods/cookingforblockheads/CommonProxy.java @@ -498,6 +498,9 @@ public void postInit(FMLPostInitializationEvent event) { if (CookingConfig.moduleGrectech5U && !Loader.isModLoaded("gregapi_post")) { event.buildSoftDependProxy("gregtech", "net.blay09.mods.cookingforblockheads.compat.GregTech5UAddon"); } + if (CookingConfig.moduleIC2) { + event.buildSoftDependProxy("IC2", "net.blay09.mods.cookingforblockheads.compat.IC2Addon"); + } } public void loadComplete(FMLLoadCompleteEvent event) { diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/CookingConfig.java b/src/main/java/net/blay09/mods/cookingforblockheads/CookingConfig.java index 249f5271..2ae73544 100644 --- a/src/main/java/net/blay09/mods/cookingforblockheads/CookingConfig.java +++ b/src/main/java/net/blay09/mods/cookingforblockheads/CookingConfig.java @@ -29,6 +29,7 @@ public class CookingConfig { public static boolean moduleJabba; public static boolean moduleDreamcraft; public static boolean moduleGrectech5U; + public static boolean moduleIC2; public static boolean usePamsToast; public static boolean gregtech5uLoaded; @@ -97,6 +98,7 @@ public static void load(File configFile) { moduleJabba = config.getBoolean("Jabba", "modules", true, "Jabba"); moduleDreamcraft = config.getBoolean("Dreamcraft", "modules", true, "Dreamcraft"); moduleGrectech5U = config.getBoolean("Gregtech5U", "modules", true, "Gregtech5U"); + moduleIC2 = config.getBoolean("IC2", "modules", true, "IndustrialCraft2"); usePamsToast = config.getBoolean( "Use Pam's Toast", "modules", diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/compat/GregTech5UAddon.java b/src/main/java/net/blay09/mods/cookingforblockheads/compat/GregTech5UAddon.java index 1ca59875..0662a8f4 100644 --- a/src/main/java/net/blay09/mods/cookingforblockheads/compat/GregTech5UAddon.java +++ b/src/main/java/net/blay09/mods/cookingforblockheads/compat/GregTech5UAddon.java @@ -45,7 +45,7 @@ public void craftingComplete() {} private static final ItemStack[] ADDITIONAL_RECIPES = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1L), GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L), - GameRegistry.findItemStack("IC2", "itemCofeePowder", 1), }; + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L), }; private static final short[] META_TOOLS = new short[] { (short) IDMetaTool01.HARDHAMMER.ID, (short) IDMetaTool01.SOFTMALLET.ID, (short) IDMetaTool01.KNIFE.ID, (short) IDMetaTool01.BUTCHERYKNIFE.ID, diff --git a/src/main/java/net/blay09/mods/cookingforblockheads/compat/IC2Addon.java b/src/main/java/net/blay09/mods/cookingforblockheads/compat/IC2Addon.java new file mode 100644 index 00000000..5a2b8174 --- /dev/null +++ b/src/main/java/net/blay09/mods/cookingforblockheads/compat/IC2Addon.java @@ -0,0 +1,22 @@ +package net.blay09.mods.cookingforblockheads.compat; + +import net.blay09.mods.cookingforblockheads.CookingConfig; +import net.blay09.mods.cookingforblockheads.api.event.FoodRegistryInitEvent; +import net.minecraftforge.common.MinecraftForge; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; + +public class IC2Addon { + + public IC2Addon() { + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onFoodRegistryInit(FoodRegistryInitEvent event) { + // abort early since gt5u also add the ore dict for this. + if (CookingConfig.gregtech5uLoaded) return; + event.registerNonFoodRecipe(GameRegistry.findItemStack("IC2", "itemCofeePowder", 1)); + } +}