diff --git a/MODSRC/vazkii/botania/common/brew/ModBrews.java b/MODSRC/vazkii/botania/common/brew/ModBrews.java
index 6a2ae143d..13c4da74b 100644
--- a/MODSRC/vazkii/botania/common/brew/ModBrews.java
+++ b/MODSRC/vazkii/botania/common/brew/ModBrews.java
@@ -14,6 +14,7 @@ package vazkii.botania.common.brew;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import vazkii.botania.api.brew.Brew;
+import vazkii.botania.common.Botania;
import vazkii.botania.common.lib.LibBrewNames;
public class ModBrews {
@@ -40,7 +41,7 @@ public class ModBrews {
public static Brew manashock;
public static Brew gravitation;
public static Brew cleansing;
-
+
public static Brew warpWard;
public static void init() {
@@ -56,7 +57,7 @@ public class ModBrews {
invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 4000, new PotionEffect(Potion.invisibility.id, 9600, 0));
nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffect(Potion.nightVision.id, 9600, 0));
absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(Potion.field_76444_x.id, 1800, 3));
-
+
soulCross = new BrewModPotion(LibBrewNames.SOUL_CROSS, 10000, new PotionEffect(ModPotions.soulCross.id, 1800, 0));
featherfeet = new BrewModPotion(LibBrewNames.FEATHER_FEET, 7000, new PotionEffect(ModPotions.featherfeet.id, 1800, 0));
emptiness = new BrewModPotion(LibBrewNames.EMPTINESS, 30000, new PotionEffect(ModPotions.emptiness.id, 7200, 0));
@@ -66,7 +67,17 @@ public class ModBrews {
manashock = new BrewModPotion(LibBrewNames.MANASHOCK, 15000, new PotionEffect(ModPotions.manashock.id, 200, 0));
gravitation = new BrewModPotion(LibBrewNames.MANASHOCK, 12000, new PotionEffect(ModPotions.gravitation.id, 1800, 0));
cleansing = new BrewModPotion(LibBrewNames.CLEANSING, 16000, new PotionEffect(ModPotions.cleansing.id, 1200, 0));
-
- // TODO Warp Ward if TC is loaded
+ }
+
+ public static void initTC() {
+ Potion warpWardPotion = null;
+ for(Potion potion : Potion.potionTypes)
+ if(potion != null && potion.getName().equals("potion.warpward")) {
+ warpWardPotion = potion;
+ break;
+ }
+
+ if(warpWardPotion != null)
+ warpWard = new BrewMod(LibBrewNames.WARP_WARD, 0xFBBDFF, 25000, new PotionEffect(warpWardPotion.id, 12000, 0));
}
}
diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java
index a3879a516..433a8d303 100644
--- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java
+++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java
@@ -99,10 +99,16 @@ public class CommonProxy {
FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName());
- if(Botania.bcTriggersLoaded) new StatementAPIPlugin();
+ if(Botania.bcTriggersLoaded)
+ new StatementAPIPlugin();
}
public void postInit(FMLPostInitializationEvent event) {
+ if(Botania.thaumcraftLoaded) {
+ ModBrews.initTC();
+ ModBrewRecipes.initTC();
+ }
+
ModBlocks.addDispenserBehaviours();
ConfigHandler.loadPostInit();
LexiconData.postInit();
diff --git a/MODSRC/vazkii/botania/common/crafting/ModBrewRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModBrewRecipes.java
index c7d3ad5eb..256851974 100644
--- a/MODSRC/vazkii/botania/common/crafting/ModBrewRecipes.java
+++ b/MODSRC/vazkii/botania/common/crafting/ModBrewRecipes.java
@@ -13,6 +13,7 @@ package vazkii.botania.common.crafting;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
+import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipeBrew;
@@ -33,6 +34,8 @@ public class ModBrewRecipes {
public static RecipeBrew invisibilityBrew;
public static RecipeBrew nightVisionBrew;
public static RecipeBrew absorptionBrew;
+
+ public static RecipeBrew warpWardBrew;
public static void init() {
speedBrew = BotaniaAPI.registerBrewRecipe(ModBrews.speed, new ItemStack(Items.nether_wart), new ItemStack(Items.sugar), new ItemStack(Items.redstone));
@@ -48,5 +51,13 @@ public class ModBrewRecipes {
nightVisionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.nightVision, new ItemStack(Items.nether_wart), new ItemStack(Items.spider_eye), new ItemStack(Items.golden_carrot));
absorptionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.absorption, new ItemStack(Items.nether_wart), new ItemStack(Items.golden_apple), new ItemStack(Items.potato));
}
+
+ public static void initTC() {
+ Item resource = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemResource");
+ Item bathSalts = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemBathSalts");
+
+ warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, new ItemStack(Items.nether_wart), new ItemStack(resource, 1, 14), new ItemStack(bathSalts), new ItemStack(resource, 1, 6));
+ }
+
}
diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java
index 93a6153d5..1de786968 100644
--- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java
+++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java
@@ -658,11 +658,6 @@ public final class LexiconData {
starfield = new ALexiconEntry(LibLexicon.MISC_STARFIELD, categoryMisc);
starfield.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeStarfield));
-
- if(Botania.thaumcraftLoaded) {
- 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);
@@ -676,5 +671,10 @@ public final class LexiconData {
shedding.setLexiconPages(new PageText("0"));
SheddingHandler.addToLexicon();
}
+
+ if(Botania.thaumcraftLoaded) {
+ 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"), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b"));
+ }
}
}
diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang
index 018480f96..fabe116ae 100644
--- a/resources/assets/botania/lang/en_US.lang
+++ b/resources/assets/botania/lang/en_US.lang
@@ -63,7 +63,7 @@ botaniamisc.dropTip1=CTRL-%key% will drop a full stack
botaniamisc.wandMode.bind=Bind Mode
botaniamisc.wandMode.function=Function Mode
botaniamisc.playVideo=Play Video
-botaniamisc.brewOf=%s Brew
+botaniamisc.brewOf=Brew of %s
# NEI INTEGRATION
botania.nei.elvenTrade=Elven Trade
@@ -1805,7 +1805,9 @@ botania.page.tcIntegration1=First and foremost, combining any of the &1Mana Meta
botania.page.tcIntegration2=Helmets of Revealing (works with any Botania helm)
botania.page.tcIntegration3=Carrying on, &4Mana&0 can also serve as an interesting type of Ink. Infusing a set of black &1Scribing Tools&0 with &4Mana&0 from a &1Mana Pool&0 allows for them to use said &4Mana&0 as their source of color.
Refilling these tools works similarly to a &1Mana Tablet&0, done by tossing it on top of the pool.
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.
+botania.page.tcIntegration5=Next off, 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.
Lastly, a special &4Brew&0 can be put together using typical thaumaturgic resources in order to apply a &4Warp Ward&0 effect.
+botania.page.tcIntegration6a=Perhaps insanity might not be the greatest tool in all of occasions. For those cases, a nice bath generally takes care of it. A brew might be a better format for such a task, though...
+botania.page.tcIntegration6b=The official frowny face
# -- BUILDCRAFT INTEGRATION
botania.entry.bcIntegration=Buildcraft Integration