From 6a3c929abeda6480be5f4a6de11ba4a9251f1ec0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 3 Dec 2015 23:27:56 +0000 Subject: [PATCH] The Diluted Mana Pool is no longer part of progression. --- .../botania/client/core/handler/HUDHandler.java | 10 ---------- .../botania/common/block/tile/mana/TilePool.java | 2 +- .../botania/common/crafting/ModCraftingRecipes.java | 9 ++++++++- .../common/crafting/ModManaInfusionRecipes.java | 4 ---- .../vazkii/botania/common/lexicon/LexiconData.java | 2 +- src/main/resources/assets/botania/lang/en_US.lang | 11 ++++++----- 6 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 642808d40..08757960e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -272,12 +272,7 @@ public final class HUDHandler { int x = res.getScaledWidth() / 2 - 11; int y = res.getScaledHeight() / 2 + 10; - boolean diluted = false; int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22; - if(u == 0 && tile.getBlockMetadata() == 2 && recipe.getOutput().getItem() != Item.getItemFromBlock(ModBlocks.pool)) { - u = 44; - diluted = true; - } int v = mc.thePlayer.getCommandSenderName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; GL11.glEnable(GL11.GL_BLEND); @@ -293,11 +288,6 @@ public final class HUDHandler { RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, recipe.getOutput(), x + 26, y); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - if(diluted) { - String s = StatCollector.translateToLocal("botaniamisc.pay2win"); - mc.fontRenderer.drawStringWithShadow(s, res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(s) / 2, y + 20, 0xFF8888); - } - GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_BLEND); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index c6eef89f2..f45ef219d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -145,7 +145,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc return false; for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { - if(recipe.matches(stack) && (!recipe.isAlchemy() || alchemy) && (!recipe.isConjuration() || conjuration) && (getBlockMetadata() != 2 || recipe.getOutput().getItem() == Item.getItemFromBlock(getBlockType()))) { + if(recipe.matches(stack) && (!recipe.isAlchemy() || alchemy) && (!recipe.isConjuration() || conjuration)) { int mana = recipe.getManaToConsume(); if(getCurrentMana() >= mana) { recieveMana(-mana); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index eddaf917a..5ddd41858 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -52,6 +52,7 @@ public final class ModCraftingRecipes { public static List recipesSpreader; public static List recipesManaLens; public static IRecipe recipePool; + public static IRecipe recipePoolDiluted; public static List recipesRuneAltar; public static IRecipe recipeLensVelocity; public static IRecipe recipeLensPotency; @@ -389,11 +390,17 @@ public final class ModCraftingRecipes { recipesManaLens = BotaniaAPI.getLatestAddedRecipes(2); // Mana Pool Recipe - addOreDictRecipe(new ItemStack(ModBlocks.pool, 1, 2), + addOreDictRecipe(new ItemStack(ModBlocks.pool), "R R", "RRR", 'R', LibOreDict.LIVING_ROCK); recipePool = BotaniaAPI.getLatestAddedRecipe(); + // Diluted Mana Pool Recipe + addOreDictRecipe(new ItemStack(ModBlocks.pool, 1, 2), + "R R", "RRR", + 'R', new ItemStack(ModFluffBlocks.livingrockSlab)); + recipePoolDiluted = BotaniaAPI.getLatestAddedRecipe(); + // Runic Altar Recipe addOreDictRecipe(new ItemStack(ModBlocks.runeAltar), "SSS", "SPS", diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index fea603f8c..588428c3b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -26,8 +26,6 @@ import vazkii.botania.common.lib.LibOreDict; public final class ModManaInfusionRecipes { - public static RecipeManaInfusion poolRecipe; - public static List manaPetalRecipes; public static List manasteelRecipes; public static RecipeManaInfusion manaPearlRecipe; @@ -46,8 +44,6 @@ public final class ModManaInfusionRecipes { public static RecipeManaInfusion sugarCaneRecipe; public static void init() { - poolRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pool), new ItemStack(ModBlocks.pool, 1, 2), 320); - manaPetalRecipes = new ArrayList(); for(int i = 0; i < 16; i++) manaPetalRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPetal, 1, i), LibOreDict.PETAL[i], 200)); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 8a69c0fe2..1a980a1c1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -367,7 +367,7 @@ public final class LexiconData { spreader.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_SPREADER), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("11"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesSpreader), new PageText("10")); pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana); - pool.setPriority().setLexiconPages(new PageText("0"), new PageText("9"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), new PageManaInfusionRecipe("10", ModManaInfusionRecipes.poolRecipe), new PageText("2"), new PageText("8"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPetalRecipes), new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)).setIcon(new ItemStack(ModBlocks.pool)); + pool.setPriority().setLexiconPages(new PageText("0"), new PageText("9"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), new PageCraftingRecipe("10", ModCraftingRecipes.recipePoolDiluted), new PageText("14"), new PageText("2"), new PageText("8"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPetalRecipes), new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)).setIcon(new ItemStack(ModBlocks.pool)); sparks = new BLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana); sparks.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PageCraftingRecipe("2", ModCraftingRecipes.recipesSpark)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 8d82cd4b4..843cbdf60 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -2038,7 +2038,7 @@ botania.entry.runeAltar=Runic Altar botania.tagline.runeAltar=Create runes for stronger flowers and items botania.page.runeAltar21=Runic creation is a rather important complex in the advancement of the botanical magics. First and foremost, though, this type of crafting requires a decent knowledge of &4Mana Manipulation&0. Before proceeding further, a read through the important entries (those in &oItalics&r) on that section of the &1Lexica Botania&0 might prove enlightening. botania.page.runeAltar0=&1Runes&0 are extremely important components of complex magical devices or flora.
In order to create these, one would require a &1Runic Altar&0.
To utilize this &1Runic Altar&0, start by placing, via either a right click or simply tossing, the components to the rune you want to create. -botania.page.runeAltar1=Proceed by linking a &1Mana Spreader&0 to the altar, and right click it with a &1Wand of the Forest&0.
It should be apparent when the altar has received enough &4Mana&0. When that happens, just drop a piece of &1Livingrock&0 on top of it and use the wand on it again to collect your rune. +botania.page.runeAltar1=Proceed by pointing a &1Mana Spreader&0 to the altar so that &4Mana&0 transfer can occur.
It should be apparent when the altar has received enough &4Mana&0. When that happens, just drop a piece of &1Livingrock&0 on top of it, or right click with it, and use the wand on it again to collect your rune. botania.page.runeAltar2=Crafting the &1Runic Altar&0. botania.page.runeAltar3=A total of 16 &1Runes&0 exist.
The most basic and elementary runes are named after the &4Four Elements&0. The intermediate runes are named after the &4Four Seasons&0, and the most advanced runes are named after the &4Seven Deadly Sins&0. A separate &1Rune of Mana&0 also exists. botania.page.runeAltar20=Sneaking and right-clicking the &1Runic Altar&0 with an empty hand while it's not accepting mana will remove the last item put into it.
Last but not least, attaching a &1Comparator&0 to it will emit signal strength &41&0 if the altar is accepting &4Mana&0 and signal strength &42&0 if it's ready to craft the rune. @@ -2110,10 +2110,11 @@ botania.page.spreader10=Right clicking the spreader with a piece of &1Wool&0 wil botania.entry.pool=Mana Pool botania.tagline.pool=Mana storage for the masses botania.page.pool0=The &1Mana Pool&0 is, simply put, a storage of &4Mana&0.
Mana can be inserted into it by usage of a &1Mana Spreader&0, and any adjacent &1Mana Spreaders&0 will pull mana from it to increase their internal buffer automatically.
Any &4Functional Flowers&0 require a nearby &1Mana Pool&0 to draw power from. -botania.page.pool9=&1Mana Pools&0 come in two varieties, a weaker, &1Diluted&0 variety which only stores a very small amount of &4Mana&0 and isn't able to infuse items, and a &1Normal&0 variety, which can store as much as a hundred times more than the dilluted one and can infuse items.
Whenever "Mana Pool" is refered elsewhere for scale, it refers to a normal one. -botania.page.pool1=Making a &1Dilluted Mana Pool&0. -botania.page.pool10=Infusing a normal &1Mana Pool&0 -botania.page.pool2=Tossing in some resources into a normal &1Mana Pool&0 will cause them to get infused with &4Mana&0, turning them into more powerful forms.
A few examples are &1Iron Ingots&0 or &1Mystical Petals&0.
&4Mana&0 reading for this block functions like the &1Mana Spreader&0. A &1Redstone Comparator&0 can also output a signal based on the contents. +botania.page.pool9=&1Mana Pools&0 come in two varieties, a weaker, &1Diluted&0 variety which only stores a very small amount of &4Mana&0, and a &1Normal&0 variety, which can store as much as a hundred times more than the dilluted one.
Whenever "Mana Pool" is refered elsewhere for scale, it refers to a normal one. +botania.page.pool1=Making a &1Mana Pool&0. +botania.page.pool10=Making a &1Diluted Mana Pool&0 +botania.page.pool14=The &1Diluted Mana Pool&0 can be a useful tool for when one might want a small buffer for a flower or system that doesn't use much &4Mana&0, as the normal pool holds a very large amount of it. Thanks to that, &4Mana&0 readings for the normal pool won't be entirely accurate, due to the scale, it's normal that the displayed bar's size will increase very slowly. +botania.page.pool2=Tossing in some resources into a &1Mana Pool&0 will cause them to get infused with &4Mana&0, turning them into more powerful forms.
A few examples are &1Iron Ingots&0 or &1Mana Pearls&0.
&4Mana&0 reading for this block functions like the &1Mana Spreader&0. A &1Redstone Comparator&0 can also output a signal based on the contents. botania.page.pool8=&1Manasteel&0 Ingots and other ingots based on it, can be converted into both blocks or nuggets through the normal conversion recipes.
For the artistic types, tossing any color of &1Floral Powder&0 in the pool will have it take its color, all sixteen colors are viable for decoration and/or easy labelling. botania.page.pool3=Infusing &1Manasteel&0 botania.page.pool4=Infusing &1Mana Pearls&0