upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-12 08:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Should work this time

Browse Source
This commit is contained in:
Alastors committed 2023-04-28 01:13:14 -04:00
1 parent b9292af3d9
commit ef4359835a
2 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/main/Config.java
+7 -5
View File
@@ -57,6 +57,7 @@ import net.minecraftforge.common.config.Property;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -94,7 +95,7 @@ public class Config {
public static int thaumcraftNodeMaxSize;
public static boolean arsMagicaActive;
public static boolean bloodMagicActive = true;
public static boolean bloodMagicActive;
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, "AWWayofTime", true);
bloodMagicActive = p.getBoolean();
p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true);
equivalentExchangeActive = p.getBoolean();
@@ -486,13 +487,14 @@ public class Config {
voidGrafter = new ItemVoidGrafter();
GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN);
try {
if (Loader.isModLoaded("AWWayofTime")) {
hiveFrameBlood = new ItemBloodFrame();
GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN);
hiveFrameFrenzy = new ItemFrenziedFrame();
GameRegistry.registerItem(hiveFrameFrenzy, hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN);
} catch (Exception ignored) {}
}
}
}
src/main/java/magicbees/main/utils/compat/BloodHelper.java
+2 -4
View File
@@ -1,7 +1,5 @@
package magicbees.main.utils.compat;
import magicbees.main.Config;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
@@ -16,14 +14,14 @@ public class BloodHelper implements IModHelper {
public static IIcon subtileIcons[];
private static boolean isBloodMagicActive = false;
public static final String Name = "bloodmagic";
public static final String Name = "AWWayofTime";
public static boolean isActive() {
return isBloodMagicActive;
}
public void preInit() {
if (Loader.isModLoaded(Name) && Config.bloodMagicActive) {
if (Loader.isModLoaded(Name)) {
isBloodMagicActive = true;
}
}