diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 9a0f9b7..751294a 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -490,7 +490,7 @@ public class Config { GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); if (BloodHelper.isActive()) { - BloodHelper.getItems(); + // BloodHelper.getItems(); } } } diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 9e7e518..8fbd72b 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -5,7 +5,6 @@ import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; @@ -15,10 +14,6 @@ import magicbees.main.CommonProxy; import magicbees.main.Config; import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.config.ConfigItems; public class BloodHelper implements IModHelper { @@ -75,22 +70,17 @@ public class BloodHelper implements IModHelper { } public static void thaumRecipes() { - ThaumcraftHelper.bloodFrame = ThaumcraftApi.addArcaneCraftingRecipe( - "MB_BloodFrame", - new ItemStack(Config.hiveFrameBlood), - new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.WATER, 50).add(Aspect.EARTH, 50) - .add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50), - new Object[] { "sbs", "bFb", "sbs", 's', ModItems.imbuedSlate, 'b', ModItems.bucketLife, 'F', - Config.hiveFrameBloodBase }); - - ThaumcraftHelper.frenziedFrame = ThaumcraftApi.addArcaneCraftingRecipe( - "MB_FrenziedFrame", - new ItemStack(Config.hiveFrameFrenzy), - new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.WATER, 50).add(Aspect.EARTH, 50) - .add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50), - new Object[] { "sns", "nFn", "sns", 's', ModItems.imbuedSlate, 'n', - new ItemStack(ConfigItems.itemResource, 1, 1), 'F', Config.hiveFrameBloodBase }); - + /* + * ThaumcraftHelper.bloodFrame = ThaumcraftApi.addArcaneCraftingRecipe( "MB_BloodFrame", new + * ItemStack(Config.hiveFrameBlood), new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.WATER, + * 50).add(Aspect.EARTH, 50) .add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50), new Object[] { "sbs", "bFb", "sbs", + * 's', ModItems.imbuedSlate, 'b', ModItems.bucketLife, 'F', Config.hiveFrameBloodBase }); + * ThaumcraftHelper.frenziedFrame = ThaumcraftApi.addArcaneCraftingRecipe( "MB_FrenziedFrame", new + * ItemStack(Config.hiveFrameFrenzy), new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, + * 50).add(Aspect.WATER, 50).add(Aspect.EARTH, 50) .add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50), new Object[] + * { "sns", "nFn", "sns", 's', ModItems.imbuedSlate, 'n', new ItemStack(ConfigItems.itemResource, 1, 1), 'F', + * Config.hiveFrameBloodBase }); + */ } public static void doBloodMagicModuleConfigs(Configuration configuration) {