From ff25ec619c7876a1dd1b9798d9987a20a055e5ff Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 15:35:23 -0400 Subject: [PATCH] Everything works again --- src/main/java/magicbees/main/Config.java | 5 +++-- .../java/magicbees/main/utils/compat/ModHelperManager.java | 3 ++- .../java/magicbees/main/utils/compat/ThaumcraftHelper.java | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 5355a27..c9414d0 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,6 +3,7 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; +import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -251,7 +252,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - bloodMagicActive = p.getBoolean(); + bloodMagicActive = (Loader.isModLoaded("AWWayofTime")); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); @@ -486,7 +487,7 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (BloodHelper.isActive()) { + if (bloodMagicActive) { BloodHelper.getItems(); } diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index 5c9c7bf..7c7f092 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,6 +39,7 @@ public class ModHelperManager { helpers.add(new RedstoneArsenalHelper()); helpers.add(new BotaniaHelper()); helpers.add(new AppliedEnergisticsHelper()); - helpers.add(new BloodHelper()); + // helpers.add(new BloodHelper()); + // Kuba, if you want this to be added to the helper list, you're going to have to be the one to fix it. } } diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 2043e2b..0f83d4d 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -443,7 +443,7 @@ public class ThaumcraftHelper implements IModHelper { new Object[] { " T", " s ", "s ", 's', Items.stick, 'T', new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) }); - if (BloodHelper.isActive()) { + if (Config.bloodMagicActive) { BloodHelper.thaumRecipes(); } } @@ -690,7 +690,7 @@ public class ThaumcraftHelper implements IModHelper { new ResearchPage((IArcaneRecipe) visAuraProvider)) .setParentsHidden("VISPOWER").registerResearchItem(); - if (BloodHelper.isActive()) { + if (Config.bloodMagicActive) { bloodFrame1 = new ResearchPage("bloodFrame.1"); bloodFrame2 = new ResearchPage((IArcaneRecipe) bloodFrame);