diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java
index 8d3690f3c..9d9afa6b8 100644
--- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java
+++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java
@@ -200,6 +200,7 @@ public final class ModCraftingRecipes {
public static IRecipe recipeVial;
public static IRecipe recipeFlask;
public static IRecipe recipeBrewery;
+ public static IRecipe recipeBloodPendant;
public static void init() {
// Lexicon Recipe
@@ -1265,6 +1266,14 @@ public final class ModCraftingRecipes {
'M', new ItemStack(ModBlocks.storage));
recipeBrewery = BotaniaAPI.getLatestAddedRecipe();
+ // Tainted Blood Pendant Recipe
+ addOreDictRecipe(new ItemStack(ModItems.bloodPendant),
+ " P ", "PGP", "DP ",
+ 'P', LibOreDict.PRISMARINE_SHARD,
+ 'G', new ItemStack(Items.ghast_tear),
+ 'D', LibOreDict.MANA_DIAMOND);
+ recipeBloodPendant = BotaniaAPI.getLatestAddedRecipe();
+
// Mana and Terrasteel Block Recipes
addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0),
"III", "III", "III",
diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java
index 2e1ce442b..5647ab445 100644
--- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java
+++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java
@@ -32,6 +32,7 @@ import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.brew.IBrewContainer;
import vazkii.botania.api.brew.IBrewItem;
+import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.helper.IconHelper;
@@ -40,7 +41,7 @@ import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.brew.ItemBrewBase;
import vazkii.botania.common.lib.LibItemNames;
-public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem {
+public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem {
private static final String TAG_BREW_KEY = "brewKey";
@@ -170,4 +171,9 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
return brew.getManaCost() * 10;
}
+ @Override
+ public boolean usesMana(ItemStack stack) {
+ return getBrew(stack) != BotaniaAPI.fallbackBrew;
+ }
+
}
diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
index 683c77ba4..bc80df679 100644
--- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
+++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java
@@ -166,6 +166,7 @@ public final class LexiconData {
public static LexiconEntry reachRing;
public static LexiconEntry itemFinder;
public static LexiconEntry superLavaPendant;
+ public static LexiconEntry bloodPendant;
public static LexiconEntry alfhomancyIntro;
public static LexiconEntry elvenMessage;
@@ -607,6 +608,9 @@ public final class LexiconData {
superLavaPendant = new ALexiconEntry(LibLexicon.BAUBLE_SUPER_LAVA_PENDANT, categoryBaubles);
superLavaPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeSuperLavaPendant));
+ bloodPendant = new BLexiconEntry(LibLexicon.BAUBLE_BLOOD_PENDANT, categoryBaubles);
+ bloodPendant.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeBloodPendant));
+
// ALFHOMANCY ENTRIES
alfhomancyIntro = new BLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy);
alfhomancyIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeAlfPortal), new PageCraftingRecipe("3", ModCraftingRecipes.recipeNaturaPylon),
diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
index 3eea9aa98..18b9a222f 100644
--- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java
+++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java
@@ -148,6 +148,7 @@ public final class LibLexicon {
public static final String BAUBLE_REACH_RING = "reachRing";
public static final String BAUBLE_ITEM_FINDER = "itemFinder";
public static final String BAUBLE_SUPER_LAVA_PENDANT = "superLavaPendant";
+ public static final String BAUBLE_BLOOD_PENDANT = "bloodPendant";
public static final String ALF_INTRO = "aIntro";
public static final String ALF_MESSAGE = "elfMessage";
diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang
index 1ff69052c..abf5e253c 100644
--- a/src/main/resources/assets/botania/lang/en_US.lang
+++ b/src/main/resources/assets/botania/lang/en_US.lang
@@ -1286,7 +1286,7 @@ botania.page.manaAlchemy22=Making &1Coarse Dirt&0
# -- BOTANICAL BREWERY
botania.entry.brewery=Botanical Brewery
-botania.page.brewery0=Given the versatility of &4Mana&0, the fact that it can be used to conjure some sort of &4Potions&0 comes to nobody's surprise. &4Brews&0 are a variant of &4Potions&0, to put it simply. They're created using &4Mana&0 and a set of ingedients.
Unlike &4Potions&0, &4Brews&0 have defined recipes, and each vial contains multiple doses.
+botania.page.brewery0=Given the versatility of &4Mana&0, the fact that it can be used to conjure some sort of &4Potions&0 comes to nobody's surprise. &4Brews&0 are a variant of &4Potions&0, to put it simply. They're created using &4Mana&0 and a set of ingredients.
Unlike &4Potions&0, &4Brews&0 have defined recipes, and each vial contains multiple doses.
botania.page.brewery1=In order to create &4Brews&0 one would require a &1Botanical Brewery&0, &1Vials&0 and of course, the reagents defined in the recipe.
The &4Mana&0 functions as the both the solvent and energy source and is given through &4Mana Bursts&0, simply pointing a &1Mana Spreader&0 at the &1Brewery&0 will work just fine.
botania.page.brewery2=Crafting the &1Botanical Brewery&0
botania.page.brewery3=Crafting &1Vials&0
@@ -1672,6 +1672,13 @@ botania.entry.superLavaPendant=Crimson Pendant
botania.page.superLavaPendant0=The &1Crimson Pendant&0 is, in simple terms, an upgraded counterpart to the &1Pyroclast Pendant&0, wearing it provides the wearer immunity to all fire and lava damage, instead of just extinguishing them.
botania.page.superLavaPendant1=Runner-up on Monolith Code
+
+# -- TAINED BLOOD PENDANT
+botania.entry.bloodPendant=Tained Blood Pendant
+botania.page.bloodPendant0=Messing around with the original source of the &4Potion&0 design, the Nether, seems to work fairly well at harnessing that very power.
The &1Tainted Blood Pendant&0 allows one to store a &4Brew&0 in a condensed, wearable state. Infusing this pendant with one and wearing it will apply the effect while it's worn, for the cost of &4Mana&0 depending on the power of the &4Brew&0.
+botania.page.bloodPendant1=To infuse the pendant with a &4Brew&0 the normal procedure of infusing one on a &1Vial&0 is what's required. The cost increases by a tenfold, though.
However, the pendant will not accept any and all effects, a few don't seem to behave well, such as &4Instant Health&0 or &4Absorption&0. Lastly, &4Brews&0 with more than one effect will fail as well.
+botania.page.bloodPendant2=I'll get Saber for sure
+
# - ALFHOMANCY
# -- THE PORTAL TO ALFHEIM
botania.entry.aIntro=The Portal to Alfheim