Alfhomancy rebalance: Part 1.

MODSRC/vazkii/botania/client/lib/LibResources.java

@@ -64,6 +64,8 @@ public final class LibResources {
 	public static final String MODEL_PYLON = PREFIX_MODEL + "pylon.png";
 	public static final String MODEL_PYLON_GREEN_OLD = PREFIX_MODEL + "pylonOld1.png";
 	public static final String MODEL_PYLON_GREEN = PREFIX_MODEL + "pylon1.png";
+	public static final String MODEL_PYLON_PINK_OLD = PREFIX_MODEL + "pylonOld2.png";
+	public static final String MODEL_PYLON_PINK = PREFIX_MODEL + "pylon2.png";
 	public static final String MODEL_LEXICA = PREFIX_MODEL + "lexica.png";
 	public static final String MODEL_MANASTEEL_0 = PREFIX_MODEL + "manasteel0.png";
 	public static final String MODEL_MANASTEEL_1 = PREFIX_MODEL + "manasteel1.png";

MODSRC/vazkii/botania/client/render/block/RenderPylon.java

@@ -30,6 +30,7 @@ public class RenderPylon implements ISimpleBlockRenderingHandler {
 		GL11.glPushMatrix();
 		GL11.glTranslatef(-0.5F, -0.7F, -0.5F);
 		RenderTilePylon.green = metadata == 1;
+		RenderTilePylon.pink = metadata == 2;
 		TileEntityRendererDispatcher.instance.renderTileEntityAt(new TilePylon(), 0.0D, 0.0D, 0.0D, 0.0F);
 		GL11.glPopMatrix();
 	}

MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java

@@ -37,8 +37,12 @@ public class RenderTilePylon extends TileEntitySpecialRenderer {
 	private static final ResourceLocation textureGreenOld = new ResourceLocation(LibResources.MODEL_PYLON_GREEN_OLD);
 	private static final ResourceLocation textureGreen = new ResourceLocation(LibResources.MODEL_PYLON_GREEN);
 
+	private static final ResourceLocation texturePinkOld = new ResourceLocation(LibResources.MODEL_PYLON_PINK_OLD);
+	private static final ResourceLocation texturePink = new ResourceLocation(LibResources.MODEL_PYLON_PINK);
+	
 	IPylonModel model;
 	public static boolean green = false;
+	public static boolean pink = false;
 
 	@Override
 	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks) {
@@ -50,10 +54,15 @@ public class RenderTilePylon extends TileEntitySpecialRenderer {
 			GL11.glEnable(GL11.GL_BLEND);
 			GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 			GL11.glColor4f(1F, 1F, 1F, 1F);
-			if(tileentity.getWorldObj() != null)
+			if(tileentity.getWorldObj() != null) {
 				green = tileentity.getBlockMetadata() == 1;
+				pink = tileentity.getBlockMetadata() == 2;
+			}
 
-			Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.oldPylonModel ? green ? textureGreenOld : textureOld : green ? textureGreen : texture);
+			if(ConfigHandler.oldPylonModel)
+				Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld);
+			else Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePink : green ? textureGreen : texture);
+			
 			int worldTime = (int) (tileentity.getWorldObj() == null ? 0 : tileentity.getWorldObj().getTotalWorldTime());
 
 			if(tileentity != null)

MODSRC/vazkii/botania/common/block/BlockPylon.java

@@ -67,13 +67,13 @@ public class BlockPylon extends BlockModContainer implements ILexiconable {
 
 	@Override
 	public void getSubBlocks(Item par1, CreativeTabs par2, List par3) {
-		for(int i = 0; i < 2; i++)
+		for(int i = 0; i < 3; i++)
 			par3.add(new ItemStack(par1, 1, i));
 	}
 
 	@Override
 	public IIcon getIcon(int par1, int par2) {
-		return par2 == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, 1);
+		return par2 == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, par2);
 	}
 
 	@Override

MODSRC/vazkii/botania/common/block/tile/TilePylon.java

@@ -76,7 +76,7 @@ public class TilePylon extends TileEntity {
 		}
 
 		if(worldObj.rand.nextBoolean() && worldObj.isRemote)
-			Botania.proxy.sparkleFX(worldObj, xCoord + Math.random(), yCoord + Math.random() * 1.5, zCoord + Math.random(), 0.5F, meta == 1 ? 1F : 0.5F, meta == 1 ? 0.5F : 1F, (float) Math.random(), 2);
+			Botania.proxy.sparkleFX(worldObj, xCoord + Math.random(), yCoord + Math.random() * 1.5, zCoord + Math.random(), meta == 2 ? 1F : 0.5F, meta == 1 ? 1F : 0.5F, meta == 1 ? 0.5F : 1F, (float) Math.random(), 2);
 	}
 
 	private Block getBlockForMeta() {

MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java

@@ -107,7 +107,6 @@ public final class ModCrafingRecipes {
 	public static IRecipe recipeKnocbackBelt;
 	public static IRecipe recipeIcePendant;
 	public static IRecipe recipeLavaPendant;
-	public static IRecipe recipeLifeEssence;
 	public static IRecipe recipeGoldenLaurel;
 	public static IRecipe recipeTinyPlanetBlock;
 	public static IRecipe recipeAlchemyCatalyst;
@@ -603,10 +602,6 @@ public final class ModCrafingRecipes {
 				'F', LibOreDict.RUNE[1]);
 		recipeLavaPendant = BotaniaAPI.getLatestAddedRecipe();
 
-		// Essence of Eternal Life Recipe
-		addShapelessOreDictRecipe(new ItemStack(ModItems.manaResource, 12, 5), LibOreDict.TERRA_STEEL, new ItemStack(Items.nether_star), new ItemStack(Items.blaze_powder));
-		recipeLifeEssence = BotaniaAPI.getLatestAddedRecipe();
-
 		// Golden Laurel Crown Recipe
 		addOreDictRecipe(new ItemStack(ModItems.goldLaurel),
 				"G G", "LEL", "LLL",
@@ -763,7 +758,7 @@ public final class ModCrafingRecipes {
 		recipeAlfPortal = BotaniaAPI.getLatestAddedRecipe();
 
 		// Natura Pylon Recipe
-		addShapelessOreDictRecipe(new ItemStack(ModBlocks.pylon, 1, 1), ModBlocks.pylon, LibOreDict.LIFE_ESSENCE, LibOreDict.LIFE_ESSENCE);
+		addShapelessOreDictRecipe(new ItemStack(ModBlocks.pylon, 1, 2), ModBlocks.pylon, LibOreDict.ELEMENTIUM, ModBlocks.pylon);
 		recipeNaturaPylon = BotaniaAPI.getLatestAddedRecipe();
 
 		// Rod of the Seas Recipe

MODSRC/vazkii/botania/common/lexicon/LexiconData.java

@@ -195,7 +195,7 @@ public final class LexiconData {
 				new PageRuneRecipe("13", ModRuneRecipes.recipeLustRune), new PageRuneRecipe("14", ModRuneRecipes.recipeGluttonyRune), new PageRuneRecipe("15", ModRuneRecipes.recipeGreedRune), new PageRuneRecipe("16", ModRuneRecipes.recipeSlothRune), new PageRuneRecipe("17", ModRuneRecipes.recipeWrathRune), new PageRuneRecipe("18", ModRuneRecipes.recipeEnvyRune), new PageRuneRecipe("19", ModRuneRecipes.recipePrideRune));
 
 		terrasteel = new BLexiconEntry(LibLexicon.BASICS_TERRASTEEL, categoryBasics);
-		terrasteel.setLexiconPages(new PageText("0"), new PageTerrasteel("1"), new PageText("2"), new PageCraftingRecipe("3", ModCrafingRecipes.recipeLifeEssence));
+		terrasteel.setLexiconPages(new PageText("0"), new PageTerrasteel("1"));
 
 		// MANA ENTRIES
 		manaIntro = new BLexiconEntry(LibLexicon.MANA_INTRO, categoryMana);
@@ -465,7 +465,7 @@ public final class LexiconData {
 		lavaPendant = new BLexiconEntry(LibLexicon.BAUBLE_LAVA_PENDANT, categoryBaubles);
 		lavaPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeLavaPendant));
 
-		goldLaurel = new BLexiconEntry(LibLexicon.BAUBLE_GOLDEN_LAUREL, categoryBaubles);
+		goldLaurel = new ALexiconEntry(LibLexicon.BAUBLE_GOLDEN_LAUREL, categoryBaubles);
 		goldLaurel.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeGoldenLaurel));
 
 		waterRing = new BLexiconEntry(LibLexicon.BAUBLE_WATER_RING, categoryBaubles);
@@ -477,7 +477,7 @@ public final class LexiconData {
 		magnetRing = new BLexiconEntry(LibLexicon.BAUBLE_MAGNET_RING, categoryBaubles);
 		magnetRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeMagnetRing));
 
-		divaCharm = new BLexiconEntry(LibLexicon.BAUBLE_DIVA_CHARM, categoryBaubles);
+		divaCharm = new ALexiconEntry(LibLexicon.BAUBLE_DIVA_CHARM, categoryBaubles);
 		divaCharm.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeDivaCharm));
 
 		flightTiara = new ALexiconEntry(LibLexicon.BAUBLE_FLIGHT_TIARA, categoryBaubles);

resources/assets/botania/lang/en_US.lang

@@ -214,6 +214,7 @@ tile.botania:pistonRelay.name=Force Relay
 tile.botania:distributor.name=Mana Distributor
 tile.botania:pylon0.name=Mana Pylon
 tile.botania:pylon1.name=Natura Pylon
+tile.botania:pylon2.name=Gaia Pylon
 tile.botania:manaBeacon0.name=White Unstable Beacon
 tile.botania:manaBeacon1.name=Orange Unstable Beacon
 tile.botania:manaBeacon2.name=Magenta Unstable Beacon
@@ -545,7 +546,7 @@ item.botania:travelBelt.name=Soujourner's Sash
 item.botania:knockbackBelt.name=Tectonic Girdle
 item.botania:icePendant.name=Snowflake Pendant
 item.botania:lavaPendant.name=Pyroclast Pendant
-item.botania:lifeEssence.name=Essence of Eternal Life
+item.botania:lifeEssence.name=Gaia Sprit
 item.botania:goldenLaurel.name=Golden Laurel Crown
 item.botania:redstoneRoot.name=Redstone Root
 item.botania:magnetRing.name=Ring of Magnetization
@@ -672,8 +673,6 @@ botania.page.runeAltar19=The &1Rune of Pride&0.
 botania.entry.terrasteel=Terrasteel
 botania.page.terrasteel0=&1Terrasteel&0 is a powerful metal infused with the magic of nature.<br>Creating this metal proves to not be a short order, in order to create it, toss a &1Manasteel Ingot&0, a &1Mana Pearl&0 and a &1Mana Diamond&0 on top of an &4Active &1Beacon&0. A &1Mana Pool&0 must be present nearby, being at least half full. The infusion will create a single &1Terrasteel Ingot&0.
 botania.page.terrasteel1=Creating &1Terrasteel&0
-botania.page.terrasteel2=By combining the &1Terrasteel&0 with a &1Nether Star&0 and &1Blaze Powder&0, it's possible to artificially create a small extract of &1Essence of Eternal Life&0, a very powerful component in the creation of magical flora and natural instruments.
-botania.page.terrasteel3=These come not from Kyubey
 
 # - MANA
 # -- AN INTRODUCTION TO MANA
@@ -1138,7 +1137,7 @@ botania.page.openBucket1=Geeks...
 
 # -- LIFE AGGREGATOR
 botania.entry.spawnerMover=Life Aggregator
-botania.page.spawnerMover0=By arranging &1Dragonstone&0, &1Elementium&0 and &1Essence of Eternal Life&0 in a specific pattern, one can create a device that can contain the curious energies of a &1Monster Spawner&0 and materialize it in another point in space.<br>It's to note that the device will shatter after being used once.
+botania.page.spawnerMover0=By arranging &1Dragonstone&0, &1Elementium&0 and &1Gaia Spirits&0 in a specific pattern, one can create a device that can contain the curious energies of a &1Monster Spawner&0 and materialize it in another point in space.<br>It's to note that the device will shatter after being used once.
 botania.page.spawnerMover1=We got the spawner, but this isn't a won run yet
 
 # -- ROD OF BIFROST
@@ -1211,7 +1210,7 @@ botania.page.lavaPendant1=Hanako could have used one of these
 
 # -- GOLDEN LAUREL CROWN
 botania.entry.goldenLaurel=Golden Laurel Crown
-botania.page.goldenLaurel0=One of the uses for &1Essence of Eternal Life&0 is to, of course, grant a layer of immortality to one that uses it, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility.
+botania.page.goldenLaurel0=One of the uses for &1Gaia Spritis&0 is to, grant a layer of immortality to one that uses them, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility.
 botania.page.goldenLaurel1=Given the theme, probably Viridi
 
 # -- RING OF CHORDATA
@@ -1236,7 +1235,7 @@ botania.page.divaCharm1=You shall not disrespect Big Sister
 
 # -- FLUGEL TIARA
 botania.entry.flightTiara=Flügel Tiara
-botania.page.flightTiara0=The &4Flügel&0 were once a dominant species in the lands, now they're but a race past extinct, once created as godslayers, who possessed the ability of flight.<br>The usage of &1Essence of Eternal Life&0 allows for a small replica of their power, in the form of the &1Flügel Tiara&0, which, at the cost of &4Mana&0 allows for flight.
+botania.page.flightTiara0=The &4Flügel&0 were once a dominant species in the lands, now they're but a race past extinct, once created as godslayers, who possessed the ability of flight.<br>The usage of &1Gaia Spirits&0 allows for a small replica of their power, in the form of the &1Flügel Tiara&0, which, at the cost of &4Mana&0 allows for flight.
 botania.page.flightTiara1=Forty thousand books from another world
 
 # -- GREAT FAIRY RING
@@ -1246,7 +1245,7 @@ botania.page.pixieRing1=We got square heads, big pointy caps
 
 # -- GLOBETROTTER'S SASH
 botania.entry.superTravelBelt=Globetrotter's Sash
-botania.page.superTravelBelt0=The &1Globetrotter's Sash&0 is, in layman's terms, an upgrade to then &1Soujourner's Sash&0, by using &1Essence of Eternal Life&0 and some Elven resources, this new belt allows the wearer to reach incredible speeds to which the &1Soujourner's Sash&0 doesn't stand a chance.
+botania.page.superTravelBelt0=The &1Globetrotter's Sash&0 is, in layman's terms, an upgrade to then &1Soujourner's Sash&0, by using &1Gaia Spirits&0 and some Elven resources, this new belt allows the wearer to reach incredible speeds to which the &1Soujourner's Sash&0 doesn't stand a chance.
 botania.page.superTravelBelt1=No time for guessing, follow my plan instead
 
 # - ALFHOMANCY