diff --git a/assets/forbidden/lang/en_US.lang b/assets/forbidden/lang/en_US.lang
index 5c39578..a85b703 100644
--- a/assets/forbidden/lang/en_US.lang
+++ b/assets/forbidden/lang/en_US.lang
@@ -42,7 +42,8 @@ item.Wand.blood.rod=Blood
item.Wand.witchwood.rod=Witchwood
item.Wand.orichalcum.cap=Orichalcum Studded
item.Wand.alchemical.cap=Alchemically Crowned
-item.Wand.vinteum.cap=Vinteum Infused
+item.Wand.vinteum.cap=Vinteum Bound
+item.Wand.soul.cap=Ender Shielded
item.WandCores.tainted.name=Tainted Rod
item.WandCores.infernal.name=Infernal Rod
item.WandCores.soul.name=Eldritch Rod
@@ -50,6 +51,7 @@ item.WandCores.blood.name=Bloody Rod
item.WandCores.witchwood.name=Witchwood Rod
item.WandCaps.alchemical.name=Alchemical Cap
item.WandCaps.vinteum.name=Vinteum Cap
+item.WandCaps.soul.name=Ender Cap
#
# Blocks
tile.ArcaneCake.name=Thaumic Cake
@@ -110,6 +112,22 @@ forbidden.research_name.ROD_blood=Bloody Wand Core
forbidden.research_text.ROD_blood=Alchemical vis storage
forbidden.research_page.ROD_blood.1=You've created a bridge between Thaumaturgy and Alchemical Wizardry. The Blood Wand can store up to 100 vis and will gradually fill itself using Life Points.
The wand will bind itself to the first person to pick it up. As long as the rod is empty, it will try to fill itself using LP from its owner's network. If there are not enough Life Points to fuel it, it will resort to drawing health from whoever is carrying it, but this conversion is less efficient. If it has no LP to draw from and its holder falls below three hearts, the wand stops charging itself.
#
+forbidden.research_name.ROD_witchwood=Witchwood Wand Core
+forbidden.research_text.ROD_witchwood=Mana converter
+forbidden.research_page.ROD_witchwood.1=By creating a wand core out of Witchwood, you've discovered a way to convert mana into Vis. The Witchwood Wand Core holds up to 100 vis and will gradually charge itself at the cost of 150 mana per point of vis.
Further research may reveal ways to lower this price.
+#
+forbidden.research_name.CAP_alchemical=Alchemical Caps
+forbidden.research_text.CAP_alchemical=When Thaumium isn't bloody enough
+forbidden.research_page.CAP_alchemical.1=You've developed a wand cap that merges Thaumaturgy and Alchemical Wizardry. Alchemical Caps are very effective at channeling Aqua, only using 80% of the normal vis cost. Unfortunately, they're less effective than Thaumium at channeling other aspects, offering only a 95% rate on everything else.
If combined with a Bloody Wand Core, Alchemical Caps discount the amount of LP consumed by the wand, costing only 900 LP per vis. The caps also cause all attacks from a blood wand to inflict Weakness.
+#
+forbidden.research_name.CAP_vinteum=Vinteum Caps
+forbidden.research_text.CAP_vinteum=Magical wand caps
+forbidden.research_page.CAP_vinteum.1=By infusing a Thaumium cap with Vinteum, you create a cap that, when combined with a Witchwood Wand Core, lowers its mana cost to only 90 per point of vis.
The Thaumium cap seems to meld well with Vinteum, offering the same 90% vis rate.
+#
+forbidden.research_name.CAP_soul=Ender Caps
+forbidden.research_text.CAP_soul=Protection for your soul
+forbidden.research_page.CAP_soul.1=You've created a wand cap that can safely channel the destructive energy of The End. Ender Caps have an 80% vis rate on Perditio, but only 95% for other aspects.
When combined with an Eldritch Wand Core, Ender Caps also reduce the amount of corruption your soul suffers from channeling vis out of the End.
+#
forbidden.research_name.TRANSEMERALD=Emerald Transmutation
forbidden.research_text.TRANSEMERALD=Transformation of valuables into emerald
forbidden.research_page.TRANSEMERALD.1=You have discovered a way to multiply emeralds by steeping emerald fragments in lucrum harvested from other substances.
diff --git a/src/com/spiteful/forbidden/Compat.java b/src/com/spiteful/forbidden/Compat.java
index 1c77d82..1496245 100644
--- a/src/com/spiteful/forbidden/Compat.java
+++ b/src/com/spiteful/forbidden/Compat.java
@@ -153,10 +153,11 @@ public class Compat {
InfusionRecipe soul_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_soul", new ItemStack(ForbiddenItems.wandCore, 1, 2), 5, (new AspectList()).add(Aspect.ELDRITCH, 32).add(Aspect.MAGIC, 12).add(Aspect.SOUL, 16), new ItemStack(PlayerBeacons.defiledSoulPylonBlock), new ItemStack[]{ItemApi.getItem("itemResource", 14), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(Item.eyeOfEnder), new ItemStack(Item.eyeOfEnder)});
(new DarkResearchItem("ROD_soul", "THAUMATURGY", (new AspectList()).add(Aspect.ELDRITCH, 2).add(Aspect.SOUL, 1).add(Aspect.TOOL, 1), -5, 7, 4, new ItemStack(ForbiddenItems.wandCore, 1, 2))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_soul.1"), new ResearchPage(soul_recipe)}).setParents(new String[]{"ROD_silverwood", "PB_CRYSTAL"}).setConcealed().registerResearchItem();
}
- catch(Exception e)
+ catch(NoClassDefFoundError e)
{
FMLLog.log(Level.INFO, e, "Player Beacons showed Forbidden Magic who the Alpha Fox is.");
- e.printStackTrace();
+ //e.printStackTrace();
+ pb = false;
}
}
if(bm)
@@ -185,11 +186,39 @@ public class Compat {
InfusionRecipe blood_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_blood", new ItemStack(ForbiddenItems.wandCore, 1, 3), 2, (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.MAGIC, 12).add(Aspect.WATER, 16), new ItemStack(masterOrb), new ItemStack[]{new ItemStack(magicales), new ItemStack(imbuedSlate), new ItemStack(imbuedSlate), new ItemStack(tennebrae), new ItemStack(sanctus), new ItemStack(aquasalus), new ItemStack(incendium), new ItemStack(terrae), new ItemStack(aether)});
(new DarkResearchItem("ROD_blood", "THAUMATURGY", (new AspectList()).add(Aspect.LIFE, 2).add(Aspect.WATER, 1).add(Aspect.WEAPON, 1), -5, 9, 4, new ItemStack(ForbiddenItems.wandCore, 1, 3))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_blood.1"), new ResearchPage(blood_recipe)}).setParents(new String[]{"ROD_silverwood"}).setConcealed().registerResearchItem();
+ InfusionRecipe alchemical_recipe = ThaumcraftApi.addInfusionCraftingRecipe("CAP_alchemical", new ItemStack(ForbiddenItems.wandCap, 1, 0), 3, (new AspectList()).add(Aspect.LIFE, 12).add(Aspect.WATER, 6), ItemApi.getItem("itemWandCap", 1), new ItemStack[]{new ItemStack(magicales), new ItemStack(magicales), new ItemStack(magicales)});
+ (new DarkResearchItem("CAP_alchemical", "THAUMATURGY", (new AspectList()).add(Aspect.METAL, 1).add(Aspect.MAGIC, 2).add(Aspect.TOOL, 1).add(Aspect.ENERGY, 1), -7, 9, 5, new ItemStack(ForbiddenItems.wandCap, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_alchemical.1"), new ResearchPage(alchemical_recipe)}).setParents(new String[]{"ROD_blood"}).setConcealed().registerResearchItem();
+
}
catch(Exception e)
{
FMLLog.log(Level.INFO, e, "Forbidden Magic tried to do some Blood Magic, but bled out.");
e.printStackTrace();
+ bm = false;
+ }
+ }
+ if(am2)
+ {
+ try
+ {
+ Class amItems = Class.forName("am2.items.ItemsCommonProxy");
+ Class amBlocks = Class.forName("am2.blocks.BlocksCommonProxy");
+ Item essence = (Item)(amItems.getField("essence").get(null));
+ Item amOre = (Item)(amItems.getField("itemOre").get(null));
+ Item rune = (Item)(amItems.getField("rune").get(null));
+ Block witchwood = (Block)(amBlocks.getField("witchwoodLog").get(null));
+
+ InfusionRecipe witchwood_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_witchwood", new ItemStack(ForbiddenItems.wandCore, 1, 4), 5, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.EARTH, 9).add(Aspect.WATER, 9).add(Aspect.FIRE, 9).add(Aspect.AIR, 9), new ItemStack(witchwood), new ItemStack[]{new ItemStack(amOre.itemID, 1, 3), new ItemStack(essence.itemID, 1, 1), new ItemStack(essence.itemID, 1, 2), new ItemStack(essence.itemID, 1, 3), new ItemStack(essence.itemID, 1, 4), new ItemStack(rune.itemID, 1, 7), new ItemStack(rune.itemID, 1, 8), new ItemStack(amOre.itemID, 1, 2)});
+ (new DarkResearchItem("ROD_witchwood", "THAUMATURGY", (new AspectList()).add(Aspect.MAGIC, 2).add(Aspect.TREE, 1).add(Aspect.TOOL, 1), -3, 7, 4, new ItemStack(ForbiddenItems.wandCore, 1, 4))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_witchwood.1"), new ResearchPage(witchwood_recipe)}).setParents(new String[]{"ROD_silverwood"}).setConcealed().registerResearchItem();
+
+ InfusionRecipe vinteum_recipe = ThaumcraftApi.addInfusionCraftingRecipe("CAP_vinteum", new ItemStack(ForbiddenItems.wandCap, 1, 1), 5, (new AspectList()).add(Aspect.ENERGY, 12).add(Aspect.MAGIC, 6), ItemApi.getItem("itemWandCap", 6), new ItemStack[]{new ItemStack(amOre.itemID, 1, 0), new ItemStack(amOre.itemID, 1, 0), new ItemStack(amOre.itemID, 1, 0)});
+ (new DarkResearchItem("CAP_vinteum", "THAUMATURGY", (new AspectList()).add(Aspect.METAL, 1).add(Aspect.MAGIC, 2).add(Aspect.TOOL, 1).add(Aspect.ENERGY, 1), -3, 9, 5, new ItemStack(ForbiddenItems.wandCap, 1, 1))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_vinteum.1"), new ResearchPage(vinteum_recipe)}).setParents(new String[]{"ROD_witchwood"}).setConcealed().registerResearchItem();
+ }
+ catch(Exception e)
+ {
+ FMLLog.log(Level.INFO, e, "Forbidden Magic was slain by a Hecate.");
+ e.printStackTrace();
+ am2 = false;
}
}
}