Added configuration for new modules

GTNewHorizons · Apr 30, 2023 · 9f17d8c · 9f17d8c
1 parent 614acf5
commit 9f17d8c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java
@@ -74,6 +74,7 @@ public class Config {
     public static int thaumcraftNodeMaxSize;
 
     public static boolean arsMagicaActive;
+    public static boolean baublesActive;
     public static boolean bloodMagicActive;
     public static boolean equivalentExchangeActive;
     public static boolean extraBeesActive;
@@ -230,6 +231,9 @@ private void doModuleConfigs() {
         p = configuration.get(CATEGORY_MODULES, "ArsMagica", true);
         arsMagicaActive = p.getBoolean();
 
+        p = configuration.get(CATEGORY_MODULES, "Baubles", true);
+        baublesActive = p.getBoolean();
+
         p = configuration.get(CATEGORY_MODULES, "BloodMagic", true);
         bloodMagicActive = p.getBoolean();
 

diff --git a/src/main/java/magicbees/main/utils/VersionInfo.java b/src/main/java/magicbees/main/utils/VersionInfo.java
@@ -11,5 +11,5 @@ public class VersionInfo {
     public static final String Version = "GRADLETOKEN_VERSION";
     public static final String GUI_FACTORY_CLASS = "magicbees.client.gui.GuiFactory";
     public static final String Logo = "/gfx/magicbees/logo.png";
-    public static final String Depends = "required-after:Forestry@[4.2.5,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2";
+    public static final String Depends = "required-after:Forestry@[4.2.5,);after:Baubles;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2";
 }
diff --git a/src/main/java/magicbees/main/utils/compat/BaublesHelper.java b/src/main/java/magicbees/main/utils/compat/BaublesHelper.java
@@ -4,6 +4,7 @@
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Optional;
+import magicbees.main.Config;
 import magicbees.main.utils.compat.baubles.ItemBeeRing;
 
 public class BaublesHelper implements IModHelper {
@@ -19,7 +20,7 @@ public static boolean isActive() {
 
     @Override
     public void preInit() {
-        if (Loader.isModLoaded(Name)) {
+        if (Loader.isModLoaded(Name) && Config.baublesActive) {
             isModActive = true;
         }
     }

diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java
@@ -37,7 +37,7 @@ public static boolean isActive() {
 
     @Override
     public void preInit() {
-        if (Loader.isModLoaded(Name)) {
+        if (Loader.isModLoaded(Name) && Config.bloodMagicActive) {
             isBloodMagicActive = true;
         }
     }