diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 28d8a189f..fe1a25f93 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -210,6 +210,8 @@ public final class ModCraftingRecipes { public static IRecipe recipeRedStringComparator; public static IRecipe recipeRedStringRelay; public static IRecipe recipeMissileRod; + public static IRecipe recipeHolyCloak; + public static IRecipe recipeUnholyCloak; public static void init() { // Lexicon Recipe @@ -1259,13 +1261,13 @@ public final class ModCraftingRecipes { "G G", " G ", 'G', new ItemStack(ModBlocks.manaGlass)); recipeVial = BotaniaAPI.getLatestAddedRecipe(); - + // Flask Recipe GameRegistry.addRecipe(new ItemStack(ModItems.vial, 3, 1), "G G", " G ", 'G', new ItemStack(ModBlocks.elfGlass)); recipeFlask = BotaniaAPI.getLatestAddedRecipe(); - + // Botanical Brewery Recipe addOreDictRecipe(new ItemStack(ModBlocks.brewery), "RSR", "RAR", "RMR", @@ -1274,7 +1276,7 @@ public final class ModCraftingRecipes { 'A', LibOreDict.RUNE[8], 'M', new ItemStack(ModBlocks.storage)); recipeBrewery = BotaniaAPI.getLatestAddedRecipe(); - + // Tainted Blood Pendant Recipe addOreDictRecipe(new ItemStack(ModItems.bloodPendant), " P ", "PGP", "DP ", @@ -1282,7 +1284,7 @@ public final class ModCraftingRecipes { 'G', new ItemStack(Items.ghast_tear), 'D', LibOreDict.MANA_DIAMOND); recipeBloodPendant = BotaniaAPI.getLatestAddedRecipe(); - + // Terrestrial Agglomeration Plate Recipe addOreDictRecipe(new ItemStack(ModBlocks.terraPlate), "LLL", "0M1", "283", @@ -1294,7 +1296,7 @@ public final class ModCraftingRecipes { '3', LibOreDict.RUNE[3], '8', LibOreDict.RUNE[8]); recipeTerraPlate = BotaniaAPI.getLatestAddedRecipe(); - + // Red String Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 1, 12), new ItemStack(Items.string), new ItemStack(Blocks.redstone_block), LibOreDict.PIXIE_DUST); recipeRedString = BotaniaAPI.getLatestAddedRecipe(); @@ -1308,7 +1310,7 @@ public final class ModCraftingRecipes { 'S', LibOreDict.RED_STRING, 'C', new ItemStack(Blocks.chest)); recipeRedStringContainer = BotaniaAPI.getLatestAddedRecipe(); - + // Red String Dispenser Recipe addOreDictRecipe(new ItemStack(ModBlocks.redStringDispenser), "RRR", "RDS", "RRR", @@ -1316,7 +1318,7 @@ public final class ModCraftingRecipes { 'S', LibOreDict.RED_STRING, 'D', new ItemStack(Blocks.dispenser)); recipeRedStringDispenser = BotaniaAPI.getLatestAddedRecipe(); - + // Red String Fertilizer Recipe addOreDictRecipe(new ItemStack(ModBlocks.redStringFertilizer), "RRR", "RBS", "RRR", @@ -1324,7 +1326,7 @@ public final class ModCraftingRecipes { 'S', LibOreDict.RED_STRING, 'B', new ItemStack(ModItems.fertilizer)); recipeRedStringFertilizer = BotaniaAPI.getLatestAddedRecipe(); - + // Red String Comparator Recipe addOreDictRecipe(new ItemStack(ModBlocks.redStringComparator), "RRR", "RCS", "RRR", @@ -1332,7 +1334,7 @@ public final class ModCraftingRecipes { 'S', LibOreDict.RED_STRING, 'C', new ItemStack(Items.comparator)); recipeRedStringComparator = BotaniaAPI.getLatestAddedRecipe(); - + // Red String Spoofer Recipe addOreDictRecipe(new ItemStack(ModBlocks.redStringRelay), "RRR", "RMS", "RRR", @@ -1340,15 +1342,31 @@ public final class ModCraftingRecipes { 'S', LibOreDict.RED_STRING, 'M', new ItemStack(ModBlocks.spreader)); recipeRedStringRelay = BotaniaAPI.getLatestAddedRecipe(); - - // Rod of the Arcane Barrage + + // Rod of the Arcane Barrage Recipe addOreDictRecipe(new ItemStack(ModItems.missileRod), "GDD", " TD", "T G", 'G', LibOreDict.LIFE_ESSENCE, 'D', LibOreDict.DRAGONSTONE, 'T', LibOreDict.LIVINGWOOD_TWIG); recipeMissileRod = BotaniaAPI.getLatestAddedRecipe(); - + + // Cloak of Virtue Recipe + addOreDictRecipe(new ItemStack(ModItems.holyCloak), + "WWW", "GWG", "GSG", + 'W', new ItemStack(Blocks.wool), + 'G', new ItemStack(Items.glowstone_dust), + 'S', LibOreDict.LIFE_ESSENCE); + recipeHolyCloak = BotaniaAPI.getLatestAddedRecipe(); + + // Cloak of Sin Recipe + addOreDictRecipe(new ItemStack(ModItems.unholyCloak), + "WWW", "RWR", "RSR", + 'W', new ItemStack(Blocks.wool, 1, 15), + 'R', new ItemStack(Items.redstone), + 'S', LibOreDict.LIFE_ESSENCE); + recipeUnholyCloak = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", @@ -1388,7 +1406,7 @@ public final class ModCraftingRecipes { addStairsAndSlabs(ModBlocks.customBrick, 1, ModBlocks.soulBrickStairs, ModBlocks.soulBrickSlab); addStairsAndSlabs(ModBlocks.customBrick, 2, ModBlocks.snowBrickStairs, ModBlocks.snowBrickSlab); addStairsAndSlabs(ModBlocks.customBrick, 3, ModBlocks.tileStairs, ModBlocks.tileSlab); - + // Misc Recipes GameRegistry.addShapelessRecipe(new ItemStack(Items.reeds, 9, 0), new ItemStack(ModBlocks.reedBlock)); GameRegistry.addShapelessRecipe(new ItemStack(Items.wheat, 4, 0), new ItemStack(ModBlocks.thatch)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index e73ceb335..fd3fa7c16 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -14,11 +14,11 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -40,8 +40,8 @@ public class ItemUnholyCloak extends ItemHolyCloak { int range = 6; List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(IMob mob : mobs) - if(mob instanceof EntityLiving) { - EntityLiving entity = (EntityLiving) mob; + if(mob instanceof EntityLivingBase) { + EntityLivingBase entity = (EntityLivingBase) mob; entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.ammount); } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 80f00d305..38be180f2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -170,6 +170,7 @@ public final class LexiconData { public static LexiconEntry itemFinder; public static LexiconEntry superLavaPendant; public static LexiconEntry bloodPendant; + public static LexiconEntry judgementCloaks; public static LexiconEntry alfhomancyIntro; public static LexiconEntry elvenMessage; @@ -627,6 +628,9 @@ public final class LexiconData { bloodPendant = new BLexiconEntry(LibLexicon.BAUBLE_BLOOD_PENDANT, categoryBaubles); bloodPendant.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeBloodPendant)); + judgementCloaks = new ALexiconEntry(LibLexicon.BAUBLE_JUDGEMENT_CLOAKS, categoryBaubles); + judgementCloaks.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHolyCloak), new PageCraftingRecipe("3", ModCraftingRecipes.recipeUnholyCloak)); + // 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 43e7c6a23..5e4bf93e9 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -151,6 +151,7 @@ public final class LibLexicon { 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 BAUBLE_JUDGEMENT_CLOAKS = "judgementCloaks"; 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 e96ef873a..e452dcec4 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1716,6 +1716,13 @@ botania.page.bloodPendant0=Messing around with the original source of the &4Poti 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 +# -- CLOAKS OF JUDGEMENT +botania.entry.judgementCloaks=Cloaks of Judgement +botania.page.judgementCloaks0=The &1Cloaks of Judgement&0 are a pair of cloaks that can be worn instead of a belt (and thus, they go in the Belt slot). Their strength triggers when their wearer takes damage. After that, they'll go in a ten second recharge period in which their effects won't trigger. +botania.page.judgementCloaks1=The &1Cloak of Virtue&0 will, when active, block the full extent of a piece of damage taken. This does not apply to magic damage.
The &1Cloak of Sin&0 will damage all nearby hostile mobs for the same amount of damage that was taken. +botania.page.judgementCloaks2=A Holy Mantle +botania.page.judgementCloaks3=Taste Vengance! + # - ALFHOMANCY # -- THE PORTAL TO ALFHEIM botania.entry.aIntro=The Portal to Alfheim