diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 90a11585b..a8a01a897 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -41,7 +41,15 @@ public final class ModCrafingRecipes { public static IRecipe recipeRainbowLens; public static IRecipe recipePool; public static IRecipe recipeRuneAltar; - + public static IRecipe recipeLensVelocity; + public static IRecipe recipeLensPotency; + public static IRecipe recipeLensResistance; + public static IRecipe recipeLensEfficiency; + public static IRecipe recipeLensBounce; + public static IRecipe recipeLensGravity; + public static IRecipe recipeLensBore; + public static IRecipe recipeLensDamaging; + public static void init() { // Lexicon Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Item.book); @@ -113,7 +121,7 @@ public final class ModCrafingRecipes { addShapelessOreDictRecipe(ItemLens.setLensColor(new ItemStack(ModItems.lens), 16), new ItemStack(ModItems.lens), LibOreDict.MANA_PEARL); recipeRainbowLens = BotaniaAPI.getLatestAddedRecipe(); for(int i = 1; i < ItemLens.SUBTYPES; i++) - addShapelessOreDictRecipe(ItemLens.setLensColor(new ItemStack(ModItems.lens, 1, i), 16), new ItemStack(ModItems.lens, 1, i), LibOreDict.DYE[i]); + addShapelessOreDictRecipe(ItemLens.setLensColor(new ItemStack(ModItems.lens, 1, i), 16), new ItemStack(ModItems.lens, 1, i), LibOreDict.MANA_PEARL); // Mana Pool Recipe addOreDictRecipe(new ItemStack(ModBlocks.pool), @@ -127,6 +135,31 @@ public final class ModCrafingRecipes { 'S', LibOreDict.LIVING_ROCK, 'P', LibOreDict.MANA_PEARL); recipeRuneAltar = BotaniaAPI.getLatestAddedRecipe(); + + // Lens Recipes + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 0, 1), new ItemStack(ModItems.lens), LibOreDict.RUNE[3]); + recipeLensVelocity = BotaniaAPI.getLatestAddedRecipe(); + + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 0, 2), new ItemStack(ModItems.lens), LibOreDict.RUNE[1]); + recipeLensPotency = BotaniaAPI.getLatestAddedRecipe(); + + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 0, 3), new ItemStack(ModItems.lens), LibOreDict.RUNE[2]); + recipeLensResistance = BotaniaAPI.getLatestAddedRecipe(); + + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 0, 4), new ItemStack(ModItems.lens), LibOreDict.RUNE[0]); + recipeLensEfficiency = BotaniaAPI.getLatestAddedRecipe(); + + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 0, 5), new ItemStack(ModItems.lens), LibOreDict.RUNE[5]); + recipeLensBounce = BotaniaAPI.getLatestAddedRecipe(); + + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 0, 6), new ItemStack(ModItems.lens), LibOreDict.RUNE[7]); + recipeLensGravity = BotaniaAPI.getLatestAddedRecipe(); + + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 0, 7), new ItemStack(ModItems.lens), LibOreDict.RUNE[11]); + recipeLensBore = BotaniaAPI.getLatestAddedRecipe(); + + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 0, 8), new ItemStack(ModItems.lens), LibOreDict.RUNE[13]); + recipeLensDamaging = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 9188cb910..1f2351d8c 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -47,6 +47,14 @@ public final class LexiconData { public static LexiconEntry manaIntro; public static LexiconEntry spreader; public static LexiconEntry pool; + public static LexiconEntry lensVelocity; + public static LexiconEntry lensPotency; + public static LexiconEntry lensResistance; + public static LexiconEntry lensEfficiency; + public static LexiconEntry lensBounce; + public static LexiconEntry lensGravity; + public static LexiconEntry lensBore; + public static LexiconEntry lensDamaging; public static LexiconEntry functionalIntro; public static LexiconEntry bellethorne; @@ -94,6 +102,30 @@ public final class LexiconData { pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana); pool.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipePool), new PageText("2"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipe), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipe), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPetalRecipes)); + lensVelocity = new BLexiconEntry(LibLexicon.MANA_LENS_VELOCITY, categoryMana); + lensVelocity.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLensVelocity)); + + lensPotency = new BLexiconEntry(LibLexicon.MANA_LENS_POTENCY, categoryMana); + lensPotency.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLensPotency)); + + lensResistance = new BLexiconEntry(LibLexicon.MANA_LENS_RESISTANCE, categoryMana); + lensResistance.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLensResistance)); + + lensEfficiency = new BLexiconEntry(LibLexicon.MANA_LENS_EFFICIENCY, categoryMana); + lensEfficiency.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLensEfficiency)); + + lensBounce = new BLexiconEntry(LibLexicon.MANA_LENS_BOUNCE, categoryMana); + lensBounce.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLensBounce)); + + lensGravity = new BLexiconEntry(LibLexicon.MANA_LENS_GRAVITY, categoryMana); + lensGravity.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLensGravity)); + + lensBore = new BLexiconEntry(LibLexicon.MANA_LENS_BORE, categoryMana); + lensBore.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLensBore)); + + lensDamaging = new BLexiconEntry(LibLexicon.MANA_LENS_DAMAGING, categoryMana); + lensDamaging.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLensDamaging)); + // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index ab0e20146..c662801d4 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -33,6 +33,14 @@ public final class LibLexicon { public static final String MANA_INTRO = "mIntro"; public static final String MANA_SPREADER = "spreader"; public static final String MANA_POOL = "pool"; + public static final String MANA_LENS_VELOCITY = "lensVelocity"; + public static final String MANA_LENS_POTENCY = "lensPotency"; + public static final String MANA_LENS_RESISTANCE = "lensResistance"; + public static final String MANA_LENS_EFFICIENCY = "lensEfficiency"; + public static final String MANA_LENS_BOUNCE = "lensBounce"; + public static final String MANA_LENS_GRAVITY = "lensGravity"; + public static final String MANA_LENS_BORE = "lensBore"; + public static final String MANA_LENS_DAMAGING = "lensDamaging"; public static final String FFLOWER_INTRO = "fIntro"; public static final String FFLOWER_BELLETHORNE = "bellethorne"; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 935785da7..a98725623 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -256,6 +256,46 @@ botania.page.pool4=Infusing &1Mana Pearls&0 botania.page.pool5=Infusing &1Mana Diamonds&0 botania.page.pool6=Infusing &1Mana Petals&0 +# -- MANA LENS: VELOCITY +botania.entry.lensVelocity=Mana Lens: Velocity +botania.page.lensVelocity0=The &1Velocity Lens&0 will drastically increase the speed at which a &4Mana Burst&0 travels, but not only does the beam start to lose it's &4Mana&0 a lot faster, it can also carry a bit less. +botania.page.lensVelocity1=Crafting the lens + +# -- MANA LENS: POTENCY +botania.entry.lensPotency=Mana Lens: Potency +botania.page.lensPotency0=The &1Potency Lens&0 will double the amount of &4Mana&0 a &4Mana Burst&0 can carry, however, the beam becomes slower and after it starts to lose mana it does so at a lot faster rate. +botania.page.lensPotency1=Crafting the lens + +# -- MANA LENS: RESISTANCE +botania.entry.lensResistance=Mana Lens: Resistance +botania.page.lensResistance0=The &1Resistance Lens&0 will significantly increase the amount of time the &4Mana Burst&0 can go without starting to lose &4Mana&0, but it makes it a a bit slower. +botania.page.lensResistance1=Crafting the lens + +# -- MANA LENS: EFFICIENCY +botania.entry.lensEfficiency=Mana Lens: Efficiency +botania.page.lensEfficiency0=The &1Efficiency Lens&0 will decrease the amount of time it takes for the &4Mana Burst&0 to start losing it's &4Mana&0, but when that happens, it does so at a lot slower rate. +botania.page.lensEfficiency1=Crafting the lens + +# -- MANA LENS: BOUNCE +botania.entry.lensBounce=Mana Lens: Bounce +botania.page.lensBounce0=The &1Bounce Lens&0 will allow the &4Mana Burst&0 to bounce off walls, rather than dissipating on a collision. +botania.page.lensBounce1=Crafting the lens + +# -- MANA LENS: GRAVITY +botania.entry.lensGravity=Mana Lens: Gravity +botania.page.lensGravity0=The &1Gravity Lens&0 makes the &4Mana Burst&0 be attracted by the world's gravitational pull, thus movimenting in an arc. For compensation, it also slightly increases the time before &4Mana&0 loss starts to happen. +botania.page.lensGravity1=Crafting the lens + +# -- MANA LENS: BORE +botania.entry.lensBore=Mana Lens: Bore +botania.page.lensBore0=The &1Bore Lens&0 charges the &4Mana Burst&0 with the ability to break any blocks it comes into contact, draining it's own mana to do so. +botania.page.lensBore1=Crafting the lens + +# -- MANA LENS: DAMAGING +botania.entry.lensDamaging=Mana Lens: Damaging +botania.page.lensDamaging0=The &1Damaging Lens&0 charges the &4Mana Burst&0 with the power to damage any living beings it comes across, draining it's own mana to do so. +botania.page.lensDamaging1=Crafting the lens + # - FUNCTIONAL FLOWERS # -- AN INTRODUCTION TO FUNCTION botania.entry.fIntro=An Introduction to Function