From 77936b6dab7e7a083067d2faaed38bca48449fc0 Mon Sep 17 00:00:00 2001
From: Alastors <78517796+Alastors@users.noreply.github.com>
Date: Thu, 27 Apr 2023 23:35:19 -0400
Subject: [PATCH] Finally fixed the optional dependency

---
 dependencies.gradle                           |  2 +-
 src/main/java/magicbees/main/Config.java      | 11 ++---
 .../main/utils/compat/BloodHelper.java        | 42 +++++++++++++++++++
 3 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/magicbees/main/utils/compat/BloodHelper.java

diff --git a/dependencies.gradle b/dependencies.gradle
index a5d9fbc..3dd097f 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -6,5 +6,5 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false}
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev')
+    compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') {transitive = false}
 }
diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java
index e5d620f..6e2d9d7 100644
--- a/src/main/java/magicbees/main/Config.java
+++ b/src/main/java/magicbees/main/Config.java
@@ -36,6 +36,7 @@ import magicbees.item.types.WaxType;
 import magicbees.main.utils.LocalizationManager;
 import magicbees.main.utils.LogHelper;
 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.ItemBloodFrame;
@@ -94,7 +95,7 @@ public class Config {
     public static int thaumcraftNodeMaxSize;
 
     public static boolean arsMagicaActive;
-    public static boolean bloodMagicActive;
+    public static boolean bloodMagicActive = true;
     public static boolean equivalentExchangeActive;
     public static boolean extraBeesActive;
     public static boolean redstoneArsenalActive;
@@ -251,8 +252,8 @@ public class Config {
         p = configuration.get(CATEGORY_MODULES, "ArsMagica", true);
         arsMagicaActive = p.getBoolean();
 
-        p = configuration.get(CATEGORY_MODULES, "BloodMagic", true);
-        bloodMagicActive = p.getBoolean();
+        p = configuration.get(CATEGORY_MODULES, "bloodmagic", true);
+      //  bloodMagicActive = p.getBoolean();
 
         p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true);
         equivalentExchangeActive = p.getBoolean();
@@ -486,13 +487,13 @@ public class Config {
 
             voidGrafter = new ItemVoidGrafter();
             GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN);
-            if (bloodMagicActive) {
+            try {
                 hiveFrameBlood = new ItemBloodFrame();
                 GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN);
 
                 hiveFrameFrenzy = new ItemFrenziedFrame();
                 GameRegistry.registerItem(hiveFrameFrenzy, hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN);
-            }
+            } catch (Exception ignored) {}
 
         }
     }
diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java
new file mode 100644
index 0000000..c3315c7
--- /dev/null
+++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java
@@ -0,0 +1,42 @@
+package magicbees.main.utils.compat;
+
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import magicbees.main.Config;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.common.config.Configuration;
+import net.minecraftforge.common.config.Property;
+
+public class BloodHelper implements IModHelper {
+
+    @SideOnly(Side.CLIENT)
+    public static IIcon subtileIcons[];
+
+    private static boolean isBloodMagicActive = false;
+    public static final String Name = "bloodmagic";
+
+
+    public static boolean isActive() {
+        return isBloodMagicActive;
+    }
+
+    public void preInit() {
+        if (Loader.isModLoaded(Name) && Config.bloodMagicActive) {
+            isBloodMagicActive = true;
+        }
+    }
+
+    public void init() { }
+
+    public void postInit() {}
+
+    public static void getBlocks() {}
+
+    public static void getItems() {}
+
+    public static void doBloodMagicModuleConfigs(Configuration configuration) {
+        Property p;
+    }
+
+}