diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 5e1167c..2a989ad 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -625,7 +625,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH @Override public ArrayList getDrops (World world, int x, int y, int z, int metadata, int fortune) { - ItemStack dropStack = new ItemStack(Item.getItemFromBlock(this), 1, metadata); + ItemStack dropStack = getMainDrop(world, x, y, z, metadata); ArrayList drops = new ArrayList(); drops.add(dropStack); @@ -637,14 +637,20 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH NBTTagCompound tiledata = new NBTTagCompound(); tile.writeToNBT(tiledata); - NBTTagCompound data = new NBTTagCompound(); - data.setTag("tile", tiledata); + NBTTagCompound data = dropStack.getTagCompound(); + if (data == null) + data = new NBTTagCompound(); + data.setTag("tile", tiledata); dropStack.setTagCompound(data); return drops; } + protected ItemStack getMainDrop (World world, int x, int y, int z, int metadata) { + return new ItemStack(Item.getItemFromBlock(this), 1, metadata); + } + @Override public TileEntityDrawers createNewTileEntity (World world, int meta) { return new TileEntityDrawersStandard(); @@ -658,7 +664,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH public TileEntityDrawers getTileEntitySafe (World world, int x, int y, int z) { TileEntityDrawers tile = getTileEntity(world, x, y, z); if (tile == null) { - tile = (TileEntityDrawers)createNewTileEntity(world, world.getBlockMetadata(x, y, z)); + tile = createNewTileEntity(world, world.getBlockMetadata(x, y, z)); world.setTileEntity(x, y, z, tile); } diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java index 7c1ae39..95d6987 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawersCustom.java @@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.block; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; +import com.jaquadro.minecraft.storagedrawers.item.ItemCustomDrawers; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -49,6 +50,15 @@ public class BlockDrawersCustom extends BlockDrawers return true; } + @Override + protected ItemStack getMainDrop (World world, int x, int y, int z, int metadata) { + TileEntityDrawers tile = getTileEntity(world, x, y, z); + if (tile == null) + return ItemCustomDrawers.makeItemStack(this, 1, null, null, null); + + return ItemCustomDrawers.makeItemStack(this, 1, tile.getMaterialSide(), tile.getMaterialTrim(), tile.getMaterialFront()); + } + @Override public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) { if (StorageDrawers.config.cache.addonShowVanilla) diff --git a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java index d7e4b78..779f327 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java +++ b/src/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersItemRenderer.java @@ -52,7 +52,7 @@ public class DrawersItemRenderer implements IItemRenderer GL11.glRotatef(90, 0, 1, 0); if (renderType == ItemRenderType.ENTITY) GL11.glRotatef(180, 0, 1, 0); - + if (renderType == ItemRenderType.INVENTORY || renderType == ItemRenderType.ENTITY) GL11.glTranslatef(block.halfDepth ? -.75f : -.5f, -.5f, -.5f);