From fddc31a8f59cf8f12c6f8013c8aaacc220ea37d7 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:06 -0400 Subject: [PATCH] Revert "a" This reverts commit 5e5a80fb5cf516d658a4ee81df410f32ac7f0235. --- src/main/java/magicbees/main/Config.java | 2 +- .../main/utils/compat/BloodHelper.java | 32 ++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 751294a..9a0f9b7 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 8fbd72b..9e7e518 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -5,6 +5,7 @@ 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; @@ -14,6 +15,10 @@ 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 { @@ -70,17 +75,22 @@ 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) {