diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 056679651..502ea23d0 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -168,6 +168,9 @@ public final class ModCraftingRecipes { public static IRecipe recipeLensWeight; public static IRecipe recipeLensPaint; public static IRecipe recipeLensWarp; + public static IRecipe recipeLensRedirect; + public static IRecipe recipeLensFirework; + public static IRecipe recipeLensFlare; public static List recipesMiniIsland; public static IRecipe recipeGaiaPylon; public static IRecipe recipeGatherDrum; @@ -1104,7 +1107,7 @@ public final class ModCraftingRecipes { 'L', new ItemStack(ModItems.lens)); recipeLensWeight = BotaniaAPI.getLatestAddedRecipe(); - // Paint Lens Recipe + // Paintslinger Lens Recipe addOreDictRecipe(new ItemStack(ModItems.lens, 1, 14), " E ", "WLW", " E ", 'E', LibOreDict.ELEMENTIUM, @@ -1116,6 +1119,18 @@ public final class ModCraftingRecipes { addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 18), new ItemStack(ModItems.lens), LibOreDict.PIXIE_DUST); recipeLensWarp = BotaniaAPI.getLatestAddedRecipe(); + // Redirective Lens Recipe + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 19), new ItemStack(ModItems.lens), LibOreDict.LIVING_WOOD, LibOreDict.ELEMENTIUM); + recipeLensRedirect = BotaniaAPI.getLatestAddedRecipe(); + + // Celebratory Lens Recipe + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 20), new ItemStack(ModItems.lens), new ItemStack(Items.fireworks), LibOreDict.ELEMENTIUM); + recipeLensFirework = BotaniaAPI.getLatestAddedRecipe(); + + // Flare Lens Recipe + addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 21), new ItemStack(ModItems.lens), new ItemStack(ModBlocks.elfGlass), LibOreDict.ELEMENTIUM); + recipeLensFlare = BotaniaAPI.getLatestAddedRecipe(); + // Mini Island Recipes for(int i = 0; i < 16; i++) GameRegistry.addRecipe(new ItemStack(ModBlocks.floatingFlower, 1, i), diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 9b228ef66..301c42f93 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -82,8 +82,7 @@ public final class LexiconData { public static LexiconEntry redstoneSpreader; public static LexiconEntry manastar; public static LexiconEntry dreamwoodSpreader; - public static LexiconEntry paintLens; - public static LexiconEntry warpLens; + public static LexiconEntry elvenLenses; public static LexiconEntry sparks; public static LexiconEntry sparkUpgrades; public static LexiconEntry rfGenerator; @@ -422,12 +421,10 @@ public final class LexiconData { dreamwoodSpreader = new ALexiconEntry(LibLexicon.MANA_DREAMWOOD_SPREADER, categoryMana); dreamwoodSpreader.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesDreamwoodSpreader), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeUltraSpreader)); - paintLens = new ALexiconEntry(LibLexicon.MANA_PAINT_LENS, categoryMana); - paintLens.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLensPaint)); - - warpLens = new ALexiconEntry(LibLexicon.MANA_WARP_LENS, categoryMana); - warpLens.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLensWarp)); - + elvenLenses = new ALexiconEntry(LibLexicon.MANA_ELVEN_LENSES, categoryMana); + elvenLenses.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLensPaint), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeLensWarp), new PageText("5"), new PageCraftingRecipe("6", ModCraftingRecipes.recipeLensRedirect), + new PageText("7"), new PageCraftingRecipe("8", ModCraftingRecipes.recipeLensFirework), new PageText("9"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeLensFlare)); + prism = new ALexiconEntry(LibLexicon.MANA_PRISM, categoryMana); prism.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipePrism)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 87466f86d..219c74dad 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -54,8 +54,7 @@ public final class LibLexicon { public static final String MANA_REDSTONE_SPREADER = "redstoneSpreader"; public static final String MANA_MANASTAR = "manastar"; public static final String MANA_DREAMWOOD_SPREADER = "dreamwoodSpreader"; - public static final String MANA_PAINT_LENS = "paintLens"; - public static final String MANA_WARP_LENS = "warpLens"; + public static final String MANA_ELVEN_LENSES = "elvenLenses"; public static final String MANA_SPARKS = "sparks"; public static final String MANA_SPARK_UPGRADES = "sparkUpgrades"; public static final String MANA_PRISM = "prism"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 8c8909b09..4fa7b8feb 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2226,16 +2226,25 @@ botania.page.dreamwoodSpreader1=Better spreaders, that's it botania.page.dreamwoodSpreader2=By combining this already powerful spreader with a &1Gaia Spirit&0 and a &1Dragonstone&0 gem, one can create an even more potent variant. The &1Gaia Spreader&0 is within the top percentage of Mana Spreaders, with pretty much upgrades all round.
It's to note that these spreaders fire a larger payload at once and thus, might fire less often. botania.page.dreamwoodSpreader3=ULTRA_SPREADER -# -- PAINTSLINGER LENS -botania.entry.paintLens=Paintslinger Lens -botania.tagline.paintLens=A Mana Lens that can paint wool and others -botania.page.paintLens0=The &4Elves&0 are one crafty bunch. This lens is somewhat unique in comparison to the other lenses. The &1Paintslinger Lens&0 needs to be dyed one of the 16 colors of the spectrum to function. When it hits a colorable block (&1Wool, Stained Clay or Glass&0...) it'll turn any blocks connected, of the same type and color, into the color of the &4Mana Burst&0 itself. It seems to work with &4Sheep&0 too. -botania.page.paintLens1=A M'AIDER Stranded Girl +# -- ELVEN MANA LENSES +botania.entry.elvenLenses=Elven Mana Lenses +botania.tagline.elvenLenses=Advanced Mana Lenses with new abilities +botania.page.elvenLenses0=The knowledge of mana handling methods of alfheim comes, of course, with an array of new &1Mana Lenses&0 that can be experimented with.
Unlike common overworld-y lenses, these are a bit more ubiquitous in their uses... +botania.page.elvenLenses1=First off, the &1Paintslinger Lens&0. This lens needs to be dyed one of the 16 colors of the spectrum to function. When a burst with its effect hits a colorable block (&1Wool, Stained Clay or Glass&0...) it'll turn any blocks connected, of the same type and color, into the color of the &4Mana Burst&0 itself. It seems to work with &4Sheep&0 too. +botania.page.elvenLenses2=Paintslinger Lens +botania.page.elvenLenses3=The &1Warp Lens&0 is an interesting one. A burst with its effect, when colliding with a &1Force Relay&0 will teleport to the end position of said &1Force Relay&0, maintaining its momentum. Furthermore, when it's used as a composite material to a &1Bore Lens&0 (the &1Bore Lens&0 must be visible) it'll make the lens not break &1Force Relays&0 or &1Pistons&0, as well as teleport any blocks to the spot where the burst was fired. +botania.page.elvenLenses4=Warp Lens +botania.page.elvenLenses5=The &1Redirective Lens&0 will only work when fired from a &1Mana Spreader&0. Any burst with its effect that would collide against a &1Mana Spreader&0, aside from the normal &4Mana&0 transfer interaction, also makes the spreader point towards the one that fired the burst. +botania.page.elvenLenses6=Redirective Lens +botania.page.elvenLenses7=The &1Celebratory Lens&0 functions much akin to the common &1Entropic Lens&0, however, instead of exploding, it creates a festive firework dyed the color of the burst. +botania.page.elvenLenses8=Celebratory Lens +botania.page.elvenLenses9=The &1Flare Lens&0 takes over a &1Mana Spreader&0's functionality, preventing it from firing any bursts. Instead, the spreader becomes a continuous particle burst of the color the lens is dyed, in the direction the spreader is firing.
There's surely plenty of decorative uses for this. +botania.page.elvenLenses10=Flare Lens # -- WARP LENS botania.entry.warpLens=Warp Lens botania.tagline.warpLens=A Mana Lens to combine with the Force Relay for burst teleporting -botania.page.warpLens0=The &1Mana Lens: Warp&0 is an interesting one. A &4Mana Burst&0 with its effect, when colliding with a &1Force Relay&0 will teleport to the end position of said &1Force Relay&0, maintaining its momentum. Furthermore, when it's used as a composite material to a &1Bore Lens&0 (the &1Bore Lens&0 must be visible) it'll make the lens not break &1Force Relays&0 or &1Pistons&0, as well as teleport any blocks to the spot where the burst was fired. +botania.page.warpLens0= botania.page.warpLens1=Hakase Quarries # -- MANA PRISM