Fix Merges

This commit is contained in:
Stuart Pomeroy 2016-03-27 20:14:13 +01:00
commit dfb7d0afd4
26 changed files with 176 additions and 90 deletions

View file

@ -90,7 +90,8 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
@Override
public int damageDropped(IBlockState state)
{
return super.damageDropped(state);
int meta = getMetaFromState(state);
return meta;
}
@Override
@ -122,5 +123,4 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
{
return types.length;
}
}

View file

@ -58,7 +58,8 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock
@Override
public int damageDropped(IBlockState state)
{
return super.damageDropped(state);
int meta = getMetaFromState(state);
return meta;
}
@Override

View file

@ -5,7 +5,7 @@ import net.minecraft.world.World;
import techreborn.client.GuiHandler;
import techreborn.tiles.lesu.TileLesu;
public class BlockLESU extends BlockEnergyStorage
public class BlockLESU extends BlockEnergyStorage
{
public BlockLESU()
{
@ -17,5 +17,4 @@ public class BlockLESU extends BlockEnergyStorage
{
return new TileLesu();
}
}

View file

@ -1,7 +1,11 @@
package techreborn.blocks.storage;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@ -44,6 +48,14 @@ public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotat
}
super.breakBlock(world, x, y, z, block, meta);
}
@Override
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
{
List<ItemStack> items = new ArrayList<ItemStack>();
items.add(new ItemStack(this));
return items;
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_)