diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index ed5bb7a4a..fcb5d4d10 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -44,6 +44,11 @@ public final class LibResources { public static final String ENTRY_ENCHANTER2 = PREFIX_ENTRIES + "enchanter2.png"; public static final String ENTRY_ENCHANTER3 = PREFIX_ENTRIES + "enchanter3.png"; public static final String ENTRY_BAUBLES = PREFIX_ENTRIES + "baubles.png"; + public static final String ENTRY_PORTAL0 = PREFIX_ENTRIES + "portal0.png"; + public static final String ENTRY_PORTAL1 = PREFIX_ENTRIES + "portal1.png"; + public static final String ENTRY_PORTAL2 = PREFIX_ENTRIES + "portal2.png"; + public static final String ENTRY_PORTAL3 = PREFIX_ENTRIES + "portal3.png"; + public static final String ENTRY_PORTAL4 = PREFIX_ENTRIES + "portal4.png"; public static final String MODEL_ALTAR = PREFIX_MODEL + "altar.png"; public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader.png"; diff --git a/MODSRC/vazkii/botania/common/block/BlockPylon.java b/MODSRC/vazkii/botania/common/block/BlockPylon.java index 384e5a80a..000b05379 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPylon.java +++ b/MODSRC/vazkii/botania/common/block/BlockPylon.java @@ -73,7 +73,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable { @Override public IIcon getIcon(int par1, int par2) { - return Blocks.diamond_block.getIcon(par1, par2); + return par2 == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, 1); } @Override @@ -93,7 +93,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable { @Override public float getEnchantPowerBonus(World world, int x, int y, int z) { - return 8; + return world.getBlockMetadata(x, y, z) == 0 ? 8 : 15; } @Override @@ -103,6 +103,6 @@ public class BlockPylon extends BlockModContainer implements ILexiconable { @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return LexiconData.pylon; + return world.getBlockMetadata(x, y, z) == 0 ? LexiconData.pylon : LexiconData.alfhomancyIntro; } } diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index f10d5f336..81a849cef 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -128,6 +128,8 @@ public final class ModCrafingRecipes { public static IRecipe recipeBlazeQuartz; public static List recipesLavenderQuartz; public static IRecipe recipeRedQuartz; + public static IRecipe recipeAlfPortal; + public static IRecipe recipeNaturaPylon; public static void init() { // Lexicon Recipe @@ -712,6 +714,17 @@ public final class ModCrafingRecipes { recipeRedQuartz = addQuartzRecipes(4, Items.redstone, ModBlocks.redQuartz, ModBlocks.redQuartzStairs, ModBlocks.redQuartzSlab); + // Alfheim Portal Recipe + addOreDictRecipe(new ItemStack(ModBlocks.alfPortal), + "WWW", "WTW", "WWW", + 'W', LibOreDict.LIVING_WOOD, + 'T', LibOreDict.TERRA_STEEL); + recipeAlfPortal = BotaniaAPI.getLatestAddedRecipe(); + + // Natura Pylon Recipe + addShapelessOreDictRecipe(new ItemStack(ModBlocks.pylon, 1, 1), ModBlocks.pylon, LibOreDict.LIFE_ESSENCE, LibOreDict.LIFE_ESSENCE); + recipeNaturaPylon = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", @@ -724,6 +737,9 @@ public final class ModCrafingRecipes { 'I', LibOreDict.ELEMENTIUM); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 0), new ItemStack(ModBlocks.storage, 1, 0)); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 4), new ItemStack(ModBlocks.storage, 1, 1)); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.manaResource, 9, 7), new ItemStack(ModBlocks.storage, 1, 2)); + + // Slab & Stair Recipes addStairsAndSlabs(ModBlocks.livingwood, 0, ModBlocks.livingwoodStairs, ModBlocks.livingwoodSlab); addStairsAndSlabs(ModBlocks.livingwood, 1, ModBlocks.livingwoodPlankStairs, ModBlocks.livingwoodPlankSlab); addStairsAndSlabs(ModBlocks.livingrock, 0, ModBlocks.livingrockStairs, ModBlocks.livingrockSlab); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index b5cfe4c1e..2fb57a31d 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -452,8 +452,10 @@ public final class LexiconData { flightTiara.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeFlightTiara)); // ALFHOMANCY ENTRIES - alfhomancyIntro = new WIPLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); - alfhomancyIntro.setLexiconPages(new PageText("0")); + alfhomancyIntro = new BLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); + alfhomancyIntro.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCrafingRecipes.recipeAlfPortal), new PageCraftingRecipe("3", ModCrafingRecipes.recipeNaturaPylon), + new PageImage("4", LibResources.ENTRY_PORTAL0), new PageImage("5", LibResources.ENTRY_PORTAL1), new PageImage("6", LibResources.ENTRY_PORTAL2), new PageImage("7", LibResources.ENTRY_PORTAL3), + new PageImage("8", LibResources.ENTRY_PORTAL4), new PageText("9"), new PageText("10"), new PageText("11")); elvenResources = new ALexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy); elvenResources.setLexiconPages(new PageText("0")); diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index c4b8050f5..9ffb2878e 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -199,7 +199,7 @@ tile.botania:shinyFlower13.name=Glimmering Green Flower tile.botania:shinyFlower14.name=Glimmering Red Flower tile.botania:shinyFlower15.name=Glimmering Black Flower tile.botania:platform.name=Abstruse Platform -tile.botania:alfheimPortal.name=World Tree Extract +tile.botania:alfheimPortal.name=Elven Gateway Core tile.botania:blockDarkQuartz.name=Block of Smokey Quartz tile.botania:chiseledDarkQuartz.name=Chiseled Smokey Quartz Block tile.botania:pillarDarkQuartz.name=Pillar Smokey Quartz Block @@ -1050,10 +1050,22 @@ 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.
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.flightTiara1=Forty thousand books from another world -# -- ALFHOMANCY +# -- THE PORTAL TO ALFHEIM botania.entry.aIntro=The Portal to Alfheim -botania.page.aIntro0=Once, in olden times, &4Elves&0 used to share the world with us &4Minecrafters&0. Due to unknown events, they have been banished back to their own world, &4Alfheim&0.
Experimentation has been done in atempt to bridge the gap between the two worlds but not much has been found thus far. +botania.page.aIntro0=Once, in olden times, &4Elves&0 used to share the world with us &4Minecrafters&0. Due to unknown events, they have been banished back to their own world, &4Alfheim&0.
Experimentation has been done in atempt to bridge the gap between the two worlds, and means of creating a portal that does just that have been devised. +botania.page.aIntro1=Creating this portal proves not to be an easy task, as quite a few exquisite resources are necessary. The requirements are as follows: 8 &1Livingwood&0 blocks, 3 &1Glimmering Livingwood&0 blocks, 1 &1Elven Gateway Core&0 (read on), 2 &1Mana Pools&0 and 2 &1Natura Pylons&0 (read on). +botania.page.aIntro2=Creating the &1Elven Gateway Core&0 +botania.page.aIntro3=Creating &1Natura Pylons&0 +botania.page.aIntro4=Make a frame of &1Livingwood&0 +botania.page.aIntro5=Add &1Glimmering Livingwood&0 +botania.page.aIntro6=Place the &1Elven Gateway Core&0 +botania.page.aIntro7=Add &1Mana Pools&0 +botania.page.aIntro8=Place &1Natura Pylons&0 above the pools +botania.page.aIntro9=To open up the portal, simply right click the core with a &1Wand of the Forest&0.
The portal requires a substantial ammount of &4Mana&0 deposited in both the pools to open up, after that, it'll slowly drain some to keep itself powered. If it runs out of &4Mana&0, the connection will be broken. +botania.page.aIntro10=The amount of &4Mana&0 required to open up the portal is orders of magnitude higher than that to keep it maintained, thus closing the portal to prevent &4Mana&0 loss is a poor strategy.
Furthermore, the link isn't strong enough to allow living beings to go through it, but it seems that &4items&0 can. +botania.page.aIntro11=The amount of information about &1Alfheim&0 stored in this lexicon is resumed to this entry alone, perhaps &4letting the Elves have a look at it&0 might prove beneficial. +# -- THE RESOURCES OF ALFHEIM botania.entry.elfResources=The Resources of Alfheim botania.page.elfResources0=WIP diff --git a/resources/assets/botania/textures/gui/entries/portal0.png b/resources/assets/botania/textures/gui/entries/portal0.png new file mode 100644 index 000000000..433cedbb6 Binary files /dev/null and b/resources/assets/botania/textures/gui/entries/portal0.png differ diff --git a/resources/assets/botania/textures/gui/entries/portal1.png b/resources/assets/botania/textures/gui/entries/portal1.png new file mode 100644 index 000000000..060bbdc07 Binary files /dev/null and b/resources/assets/botania/textures/gui/entries/portal1.png differ diff --git a/resources/assets/botania/textures/gui/entries/portal2.png b/resources/assets/botania/textures/gui/entries/portal2.png new file mode 100644 index 000000000..063f972cc Binary files /dev/null and b/resources/assets/botania/textures/gui/entries/portal2.png differ diff --git a/resources/assets/botania/textures/gui/entries/portal3.png b/resources/assets/botania/textures/gui/entries/portal3.png new file mode 100644 index 000000000..f2ca01de8 Binary files /dev/null and b/resources/assets/botania/textures/gui/entries/portal3.png differ diff --git a/resources/assets/botania/textures/gui/entries/portal4.png b/resources/assets/botania/textures/gui/entries/portal4.png new file mode 100644 index 000000000..4a35c7ed5 Binary files /dev/null and b/resources/assets/botania/textures/gui/entries/portal4.png differ