diff --git a/MODSRC/vazkii/botania/common/Botania.java b/MODSRC/vazkii/botania/common/Botania.java index ea1807ce1..9655507e1 100644 --- a/MODSRC/vazkii/botania/common/Botania.java +++ b/MODSRC/vazkii/botania/common/Botania.java @@ -17,6 +17,7 @@ import vazkii.botania.common.core.proxy.CommonProxy; import vazkii.botania.common.lib.LibMisc; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; @@ -31,7 +32,8 @@ import cpw.mods.fml.common.event.FMLServerStoppingEvent; public class Botania { public static boolean thaumcraftLoaded = false; - + public static boolean bcTriggersLoaded = false; + @Instance(LibMisc.MOD_ID) public static Botania instance; @@ -41,7 +43,8 @@ public class Botania { @EventHandler public void preInit(FMLPreInitializationEvent event) { thaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); - + bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements"); + proxy.preInit(event); } diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index e021f2a9e..ec05d2454 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -93,7 +93,7 @@ public class CommonProxy { FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); - if(ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements")) new StatementAPIPlugin(); + if(Botania.bcTriggersLoaded) new StatementAPIPlugin(); } public void postInit(FMLPostInitializationEvent event) { diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 2422bde93..b327056a5 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -189,6 +189,7 @@ public final class LexiconData { public static LexiconEntry azulejo; public static LexiconEntry starfield; public static LexiconEntry tcIntegration; + public static LexiconEntry bcIntegration; public static void init() { BotaniaAPI.addCategory(categoryBasics = new BLexiconCategory(LibLexicon.CATEGORY_BASICS)); @@ -646,6 +647,11 @@ public final class LexiconData { tcIntegration = new BLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, categoryMisc); tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5")); } + + if(Botania.bcTriggersLoaded) { + bcIntegration = new BLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc); + bcIntegration.setLexiconPages(new PageText("0"), new PageText("1")); + } } public static void postInit() { diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index a4823b314..1c25c8b3d 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -163,5 +163,6 @@ public final class LibLexicon { public static final String MISC_AZULEJO = "azulejo"; public static final String MISC_STARFIELD = "starfield"; public static final String MISC_TC_INTEGRATION = "tcIntegration"; + public static final String MISC_BC_INTEGRATION = "bcIntegration"; } diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 0530556c1..102ff4a85 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -1709,6 +1709,9 @@ botania.page.tcIntegration4=Making the &1Botanurgist's Inkwell botania.page.tcIntegration5=Last but not least, there's a few varied resources or constructs that can work as paraphernalia for an &1Infusion Altar&0, to lower its' instability.
These come in the form of &1Glimmering Flowers, Floating Flowers and any variety of Pylons&0. # -- BUILDCRAFT TRIGGER API INTEGRATION +botania.entry.bcIntegration=Buildcraft Integration +botania.page.bcIntegration0=Recent advances in piping technology have allowed &1Gates&0 to get a feel of the &4Mana&0 around them.
A &1Gate&0 can now sense whether a &4Mana&0 container is empty, full or if it contains any mana. +botania.page.bcIntegration1=&1Gates&0 can also use the &1Mana Detector&0 trigger to detect if a mana is passing by the pipe block.
In addition, they can also sense when a &1Runic Altar&0 is ready to create &4Runes&0. botania.trigger.manaDetector=Mana Burst botania.trigger.manaEmpty=Mana Empty botania.trigger.manaSpace=Space for Mana