diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index 8d412b6..63f3e46 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -319,7 +319,7 @@ public class BeeProductHelper { RSA_FLUXED.addProduct(ForestryHelper.itemHoneycomb, 10); if (RedstoneArsenalHelper.isActive()) { - RSA_FLUXED.addSpecialty(Config.rsaFluxNugget, 9); + RSA_FLUXED.addSpecialty(RedstoneArsenalHelper.fluxNugget, 9); } } diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index ca4f21b..31d14e3 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -190,9 +190,6 @@ public class Config //----- Ars Magica Items ----------------------------------- public static Item amItemResource; public static Item amEssence; - //----Redstone Arsenal Items--- - public static ItemStack rsaFluxBlock; - public static ItemStack rsaFluxNugget; //---ThermalExpansion Items --- public static ItemStack teEnderiumBlock; public static ItemStack teElectrumBlock; diff --git a/src/main/java/magicbees/main/MagicBees.java b/src/main/java/magicbees/main/MagicBees.java index 86194a7..a7bd218 100644 --- a/src/main/java/magicbees/main/MagicBees.java +++ b/src/main/java/magicbees/main/MagicBees.java @@ -59,9 +59,6 @@ public class MagicBees public void init(FMLInitializationEvent event) { ModHelper.init(); - - BeeManager.ititializeBees(); - LogHelper.info("Init completed"); } @@ -69,6 +66,8 @@ public class MagicBees public void postInit(FMLPostInitializationEvent event) { ModHelper.postInit(); + + BeeManager.ititializeBees(); this.guiHandler = new GUIHandler(); NetworkRegistry.INSTANCE.registerGuiHandler(this, this.guiHandler); diff --git a/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java b/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java index a68821c..6564d9e 100644 --- a/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java @@ -48,14 +48,13 @@ public class ArsMagicaHelper { } public static void init() { + } + + public static void postInit() { if (isActive()) { getBlocks(); getItems(); } - - } - - public static void postInit() { } private static void getBlocks() { diff --git a/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java b/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java index 6652894..922bc78 100644 --- a/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java +++ b/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java @@ -2,6 +2,7 @@ package magicbees.main.utils.compat; import magicbees.main.Config; import magicbees.main.utils.ItemInterface; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Loader; public class RedstoneArsenalHelper { @@ -12,6 +13,9 @@ public class RedstoneArsenalHelper { public enum NuggetType { ELECTRUMFLUX, ; } + + public static ItemStack fluxBlock; + public static ItemStack fluxNugget; public static final String Name = "RedstoneArsenal"; private static boolean isRedstoneArsenalPresent = false; @@ -27,21 +31,21 @@ public class RedstoneArsenalHelper { } public static void init() { + // if (isActive()) { } + } + + public static void postInit() { if (isActive()) { getBlocks(); getItems(); } } - public static void postInit() { - // if (isActive()) { } - } - private static void getBlocks() { - Config.rsaFluxBlock = ItemInterface.getItemStack("RedstoneArsenal", "blockElectrumFlux", 1); + fluxBlock = ItemInterface.getItemStack(Name, "blockElectrumFlux"); } private static void getItems() { - Config.rsaFluxNugget = ItemInterface.getItemStack("RedstoneArsenal", "nuggetElectrumFlux", 1); + fluxNugget = ItemInterface.getItemStack(Name, "nuggetElectrumFlux"); } }