From f04c50a2d7aebe6cd4a24deb147f02c6f2305197 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Wed, 18 Mar 2015 17:15:56 +0000 Subject: [PATCH] Separated the Mana Mirror and Mana Tablet entries. --- .../botania/client/gui/lexicon/GuiLexicon.java | 2 +- .../botania/common/lexicon/LexiconData.java | 11 +++++++---- .../vazkii/botania/common/lib/LibLexicon.java | 3 ++- .../resources/assets/botania/lang/en_US.lang | 17 ++++++++++------- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index a1f778256..af2b97de1 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -362,7 +362,7 @@ public class GuiLexicon extends GuiScreen { tutorial.add(LexiconData.functionalIntro); tutorial.add(LexiconData.runicAltar); tutorial.add(LexiconData.baublesIntro); - tutorial.add(LexiconData.manaTransport); + tutorial.add(LexiconData.manaTablet); tutorial.add(LexiconData.manasteelGear); tutorial.add(LexiconData.dispenserTweaks); if(SheddingHandler.hasShedding()) diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 3398a6998..c223c3ea1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -74,7 +74,8 @@ public final class LexiconData { public static LexiconEntry lenses; public static LexiconEntry distributor; public static LexiconEntry manaVoid; - public static LexiconEntry manaTransport; + public static LexiconEntry manaTablet; + public static LexiconEntry manaMirror; public static LexiconEntry manaDetector; public static LexiconEntry redstoneSpreader; public static LexiconEntry manastar; @@ -347,10 +348,12 @@ public final class LexiconData { manaVoid = new BLexiconEntry(LibLexicon.MANA_VOID, categoryMana); manaVoid.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaVoid)); - manaTransport = new BLexiconEntry(LibLexicon.MANA_TRANSPORT, categoryMana); - manaTransport.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipesManaTablet), - new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeManaMirror)); + manaTablet = new BLexiconEntry(LibLexicon.MANA_TABLET, categoryMana); + manaTablet.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipesManaTablet)); + manaMirror = new BLexiconEntry(LibLexicon.MANA_MIRROR, categoryMana); + manaMirror.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaMirror)); + manaDetector = new BLexiconEntry(LibLexicon.MANA_DETECTOR, categoryMana); manaDetector.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeManaDetector)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 2d7543be4..a66b9f5f1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -45,7 +45,8 @@ public final class LibLexicon { public static final String MANA_LENSES = "lens"; public static final String MANA_VOID = "manaVoid"; public static final String MANA_RF_GENERATOR = "rfGenerator"; - public static final String MANA_TRANSPORT = "manaTransport"; + public static final String MANA_TABLET = "manaTablet"; + public static final String MANA_MIRROR = "manaMirror"; public static final String MANA_DETECTOR = "manaDetector"; public static final String MANA_COMPOSITE_LENS = "compositeLens"; public static final String MANA_REDSTONE_SPREADER = "redstoneSpreader"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 1a210b8d4..cdf89defe 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1355,13 +1355,16 @@ botania.page.lens35=Force Lens botania.page.lens36=The &1Flash Lens&0, in contact with a block, creates a flame of the same color as the burst that caused it. The flame provides light and is purely decorative.
If it hits one of these flames, it puts it out instead. botania.page.lens37=Flash Lens -# -- PORTABLE MANA TRANSPORT -botania.entry.manaTransport=Portable Mana Transport -botania.page.manaTransport0=While using &1Mana Spreaders&0 to transport &4Mana&0 around is all well and good, there is also a way of doing it in a different manner.
The &1Mana Tablet&0 is a portable object which can carry &4Mana&0 on itself. -botania.page.manaTransport1=Tossing one of these on top of a &1Mana Pool&0 will allow for transport of &4Mana&0 between one and another.
Shift-right clicking the &1Mana Pool&0 with a &1Wand of the Forest&0 will change in which way the &4Mana&0 flows.
Lastly, unlike normal items, these will never despawn when dropped on the floor. -botania.page.manaTransport2=Don't put it on your pocket, it might bend -botania.page.manaTransport3=It's also possible to indirectly access the &4Mana&0 reserves of a &1Mana Pool&0, through using a &1Mana Mirror&0, items will pull out of the pool itself.
To bind a mirror to a pool, one would simply &4shift right-click&0 a pool with the mirror.
The mirror can't put mana in or take mana out of pools in any other way. -botania.page.manaTransport4=Mirror mirror on the wall... +# -- MANA TABLET +botania.entry.manaTablet=Mana Tablet +botania.page.manaTablet0=While using &1Mana Spreaders&0 to transport &4Mana&0 around is all well and good, there is also a way of doing it in a different manner.
The &1Mana Tablet&0 is a portable object which can carry &4Mana&0 on itself.
Not only that, but other items can also pull from it as they need it for their uses, making this an essential tool. +botania.page.manaTablet1=Tossing one of these on top of a &1Mana Pool&0 will allow for transport of &4Mana&0 between one and another.
Shift-right clicking the &1Mana Pool&0 with a &1Wand of the Forest&0 will change in which way the &4Mana&0 flows.
Lastly, unlike normal items, these will never despawn when dropped on the floor. +botania.page.manaTablet2=Don't put it on your pocket, it might bend + +# -- MANA MIRROR +botania.entry.manaMirror=Mana Mirror +botania.page.manaMirror0=A &1Mana Mirror&0 is an alternative to &4Mana&0 containing items such as a &1Mana Tablet&0. It can be bound to a &1Mana Pool&0 in the world and items will pull out of the pool itself when needing &4Mana&0.
To bind a mirror to a pool, one would simply &4shift right-click&0 a pool with the mirror. The mirror can't put mana in or take mana out of pools in any other way. +botania.page.manaMirror1=Mirror mirror on the wall... # -- MANA DETECTOR botania.entry.manaDetector=Mana Detector