diff --git a/MODSRC/vazkii/botania/common/block/BlockTinyPlanet.java b/MODSRC/vazkii/botania/common/block/BlockTinyPlanet.java index c81bebadd..075cf1f8f 100644 --- a/MODSRC/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/MODSRC/vazkii/botania/common/block/BlockTinyPlanet.java @@ -11,13 +11,18 @@ */ package vazkii.botania.common.block; +import vazkii.botania.api.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileTinyPlanet; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class BlockTinyPlanet extends BlockModContainer { +public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { protected BlockTinyPlanet() { super(Material.rock); @@ -28,12 +33,7 @@ public class BlockTinyPlanet extends BlockModContainer { setBlockBounds(size, size, size, 1F - size, 1F - size, 1F - size); setBlockName(LibBlockNames.TINY_PLANET); } - - @Override - boolean registerInCreative() { - return false; - } - + @Override public boolean renderAsNormalBlock() { return false; @@ -48,5 +48,10 @@ public class BlockTinyPlanet extends BlockModContainer { public TileEntity createNewTileEntity(World world, int meta) { return new TileTinyPlanet(); } + + @Override + public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + return LexiconData.tinyPlanet; + } } diff --git a/MODSRC/vazkii/botania/common/block/tile/TileTinyPlanet.java b/MODSRC/vazkii/botania/common/block/tile/TileTinyPlanet.java index 1db177cbf..f9a1e5d2a 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -11,13 +11,19 @@ */ package vazkii.botania.common.block.tile; +import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -public class TileTinyPlanet extends TileMod { +public class TileTinyPlanet extends TileMod implements IManaCollisionGhost { @Override public void updateEntity() { ItemTinyPlanet.applyEffect(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); } + + @Override + public boolean isGhost() { + return true; + } } diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 2711b6c34..1cbe1623c 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -89,6 +89,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.terrasteelBoots); addItem(ModItems.tinyPlanet); + addBlock(ModBlocks.tinyPlanet); addItem(ModItems.manaRing); addItem(ModItems.auraRing); addItem(ModItems.manaRingGreater); diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 5fd1ff0e2..7a6580611 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -106,6 +106,7 @@ public final class ModCrafingRecipes { public static IRecipe recipeLavaPendant; public static IRecipe recipeLifeEssence; public static IRecipe recipeGoldenLaurel; + public static IRecipe recipeTinyPlanetBlock; public static void init() { // Lexicon Recipe @@ -550,6 +551,13 @@ public final class ModCrafingRecipes { 'L', "treeLeaves", 'E', LibOreDict.LIFE_ESSENCE); recipeGoldenLaurel = BotaniaAPI.getLatestAddedRecipe(); + + // Tiny Planet Block Recipe + addOreDictRecipe(new ItemStack(ModBlocks.tinyPlanet), + "SSS", "SPS", "SSS", + 'S', "stone", + 'P', ModItems.tinyPlanet); + recipeTinyPlanetBlock = BotaniaAPI.getLatestAddedRecipe(); } private static void addOreDictRecipe(ItemStack output, Object... recipe) { diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index d1bc27a6a..0604637c3 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -324,7 +324,7 @@ public final class LexiconData { baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); tinyPlanet = new BLexiconEntry(LibLexicon.BAUBLE_TINY_PLANET, categoryBaubles); - tinyPlanet.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTinyPlanet)); + tinyPlanet.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeTinyPlanet), new PageCraftingRecipe("2", ModCrafingRecipes.recipeTinyPlanetBlock)); manaRing = new BLexiconEntry(LibLexicon.BAUBLE_MANA_RING, categoryBaubles); manaRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeManaRing), new PageCraftingRecipe("2", ModCrafingRecipes.recipeGreaterManaRing)); diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 494875402..00c79f636 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -124,6 +124,7 @@ tile.botania:manaVoid.name=Mana Void tile.botania:manaDetector.name=Mana Detector tile.botania:enchanter.name=Mana Enchanter tile.botania:turntable.name=Spreader Turntable +tile.botania:tinyPlanetBlock.name=Tiny Planet # FLOWER NAMES tile.botania:flower..name=Botania Flower @@ -704,8 +705,9 @@ botania.page.bIntro2=It's to note that, if &4Thaumcraft&0 or any other mod that # -- TINY PLANET botania.entry.tinyPlanet=Tiny Planet -botania.page.tinyPlanet0=The &1Tiny Planet&0 is a &4Bauble&0 with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her. +botania.page.tinyPlanet0=The &1Tiny Planet&0 is a &4Bauble&0 with gravitational proprieties, while equipped, the &1Tiny Planet&0 will pull any nearby &4Mana Bursts&0 towards the wearer, having them orbit around him or her.
By increasing it's masss with some &1Stone&0, it can also be placed in world, for the same effect. botania.page.tinyPlanet1=Clearly from rebirth +botania.page.tinyPlanet2=More of a planet than Pluto # -- BAND OF MANA botania.entry.manaRing=Band of Mana