diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index 096f40af5..70d3b1ddb 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -12,10 +12,12 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockFlower; -import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.ISpecialFlower; +import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower { @@ -32,7 +34,12 @@ public class BlockSpecialFlower extends BlockFlower implem @Override public TileEntity createTileEntity(World world, int metadata) { - return super.createTileEntity(world, metadata); + return new TileSpecialFlower(); + } + + @Override + public Icon getBlockTexture(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) { + return ((TileSpecialFlower) par1iBlockAccess.getBlockTileEntity(par2, par3, par4)).getIcon(); } @Override diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 6da5ff8dc..1f061b423 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -23,6 +23,7 @@ public final class ModBlocks { public static Block flower; public static Block altar; + public static Block specialFlower; public static void init() { flower = new BlockModFlower(); diff --git a/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java new file mode 100644 index 000000000..e3a9f77c6 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -0,0 +1,69 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 25, 2014, 2:04:15 PM (GMT)] + */ +package vazkii.botania.common.item.block; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemBlockSpecialFlower extends ItemBlock { + + private static String TAG_TYPE = "type"; + + @SideOnly(Side.CLIENT) + private static Map iconsForType = new HashMap(); + + public ItemBlockSpecialFlower(int par1) { + super(par1); + } + + @Override + public Icon getIcon(ItemStack stack, int pass) { + String type = getType(stack); + if(!iconsForType.containsKey(type)) { + try { + SubTileEntity tile = BotaniaAPI.getSubTileMapping(type).newInstance(); + iconsForType.put(type, tile.getIcon()); + } catch(Exception e) { + e.printStackTrace(); + } + } + + return iconsForType.get(type); + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return LibBlockNames.SPECIAL_FLOWER_PREFIX + getType(stack); + } + + public static String getType(ItemStack stack) { + return ItemNBTHelper.getString(stack, TAG_TYPE, ""); + } + + public static ItemStack ofType(String type) { + ItemStack stack = new ItemStack(ModBlocks.specialFlower); + ItemNBTHelper.setString(null, TAG_TYPE, type); + return stack; + } + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java index 9113b7017..443d16a9e 100644 --- a/MODSRC/vazkii/botania/common/lib/LibBlockNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibBlockNames.java @@ -17,5 +17,7 @@ public final class LibBlockNames { public static final String FLOWER = LibResources.PREFIX_MOD + "flower"; public static final String ALTAR = LibResources.PREFIX_MOD + "altar"; + + public static final String SPECIAL_FLOWER_PREFIX = FLOWER + "."; }