From 83b0bfc504edbb9fc8b7e5eb573deb073b1e32fd Mon Sep 17 00:00:00 2001
From: Alastors <78517796+Alastors@users.noreply.github.com>
Date: Sat, 29 Apr 2023 16:34:34 -0400
Subject: [PATCH] I actually fixed it this time

---
 src/main/java/magicbees/main/Config.java      | 24 ++++++++++++--
 .../main/utils/compat/BloodHelper.java        | 33 +++++--------------
 .../main/utils/compat/ModHelperManager.java   |  4 +--
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java
index 8b6f7b7..1cad7c5 100644
--- a/src/main/java/magicbees/main/Config.java
+++ b/src/main/java/magicbees/main/Config.java
@@ -57,6 +57,9 @@ import magicbees.main.utils.VersionInfo;
 import magicbees.main.utils.compat.BloodHelper;
 import magicbees.main.utils.compat.BotaniaHelper;
 import magicbees.main.utils.compat.ThaumcraftHelper;
+import magicbees.main.utils.compat.bloodmagic.ItemBloodBaseFrame;
+import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame;
+import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame;
 import magicbees.storage.BackpackDefinition;
 import magicbees.tileentity.TileEntityEffectJar;
 import magicbees.tileentity.TileEntityMagicApiary;
@@ -487,8 +490,25 @@ public class Config {
             voidGrafter = new ItemVoidGrafter();
             GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN);
 
-            if (bloodMagicActive) {
-                BloodHelper.getItems();
+            if (BloodHelper.isActive()) {
+                Config.hiveFrameBloodBase = new ItemBloodBaseFrame();
+                GameRegistry.registerItem(
+                        Config.hiveFrameBloodBase,
+                        Config.hiveFrameBloodBase.getUnlocalizedName(),
+                        CommonProxy.DOMAIN);
+
+                Config.hiveFrameBlood = new ItemBloodFrame();
+                GameRegistry.registerItem(
+                        Config.hiveFrameBlood,
+                        Config.hiveFrameBlood.getUnlocalizedName(),
+                        CommonProxy.DOMAIN);
+
+                Config.hiveFrameFrenzy = new ItemFrenziedFrame();
+                GameRegistry.registerItem(
+                        Config.hiveFrameFrenzy,
+                        Config.hiveFrameFrenzy.getUnlocalizedName(),
+                        CommonProxy.DOMAIN);
+
             }
 
         }
diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java
index f430bc9..4a751bc 100644
--- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java
+++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java
@@ -8,14 +8,9 @@ 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;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import magicbees.main.CommonProxy;
 import magicbees.main.Config;
-import magicbees.main.utils.compat.bloodmagic.ItemBloodBaseFrame;
-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;
@@ -34,7 +29,7 @@ public class BloodHelper implements IModHelper {
     }
 
     public void preInit() {
-        if (Loader.isModLoaded(Name) && Config.thaumcraftActive) {
+        if (Loader.isModLoaded(Name) && Config.bloodMagicActive) {
             isBloodMagicActive = true;
         }
     }
@@ -43,29 +38,17 @@ public class BloodHelper implements IModHelper {
         isBloodMagicActive = true;
     }
 
-    public void init() {}
+    public void init() {
+        getItems();
+    }
 
-    public void postInit() {}
+    public void postInit() {
+        getRecipes();
+    }
 
     public static void getBlocks() {}
 
-    public static void getItems() {
-        Config.hiveFrameBloodBase = new ItemBloodBaseFrame();
-        GameRegistry.registerItem(
-                Config.hiveFrameBloodBase,
-                Config.hiveFrameBloodBase.getUnlocalizedName(),
-                CommonProxy.DOMAIN);
-
-        Config.hiveFrameBlood = new ItemBloodFrame();
-        GameRegistry
-                .registerItem(Config.hiveFrameBlood, Config.hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN);
-
-        Config.hiveFrameFrenzy = new ItemFrenziedFrame();
-        GameRegistry
-                .registerItem(Config.hiveFrameFrenzy, Config.hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN);
-
-        getRecipes();
-    }
+    public static void getItems() {}
 
     public static void getRecipes() {
         AltarRecipeRegistry.registerAltarRecipe(
diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java
index 7c7f092..d398769 100644
--- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java
+++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java
@@ -39,7 +39,7 @@ public class ModHelperManager {
         helpers.add(new RedstoneArsenalHelper());
         helpers.add(new BotaniaHelper());
         helpers.add(new AppliedEnergisticsHelper());
-        // 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.
+        helpers.add(new BloodHelper());
+
     }
 }