mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-12 00:08:01 +00:00
Finally fixed the optional dependency
This commit is contained in:
1 parent
1d4a52c3af
commit
77936b6dab
3 files changed
+49
-6
No files matched your search
@@ -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) {}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user