From 9f17d8ceff563056a8821e51ae4c5682a4206ea5 Mon Sep 17 00:00:00 2001 From: Alexander Anishin Date: Sun, 30 Apr 2023 20:36:44 +0300 Subject: [PATCH] Added configuration for new modules --- src/main/java/magicbees/main/Config.java | 4 ++++ src/main/java/magicbees/main/utils/VersionInfo.java | 2 +- src/main/java/magicbees/main/utils/compat/BaublesHelper.java | 3 ++- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index be6e961..840e258 100644 --- 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 @@ public class Config { 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 index 8b41142..92ce70c 100644 --- 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 index a41b35f..6405ee6 100644 --- 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 net.minecraft.item.Item; 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 class BaublesHelper implements IModHelper { @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 index a4361b8..b30c508 100644 --- 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 class BloodHelper implements IModHelper { @Override public void preInit() { - if (Loader.isModLoaded(Name)) { + if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { isBloodMagicActive = true; } }