etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #62 from Leenhaart/BOP-for-1.5 

Fixed MFR Harvester integration.
This commit is contained in:
Adubbz 2013-09-02 19:31:26 -07:00
parent b70d38a8e2 06fa146f85
commit 760bdc3aa5
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/minecraft/biomesoplenty/integration/minefactoryreloaded/Harvestable.java
View File

@ -53,41 +53,17 @@ public class Harvestable implements IFactoryHarvestable
@Override
public List<ItemStack> getDrops(World world, Random rand, Map<String, Boolean> harvesterSettings, int x, int y, int z)
{
Block b = Block.blocksList[getPlantId()];
if(harvesterSettings.get("silkTouch") != null && harvesterSettings.get("silkTouch") && harvestType == HarvestType.TreeLeaf)
{
ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
drops.add(new ItemStack(sourceId, 1, world.getBlockMetadata(x, y, z)));
drops.add(new ItemStack(sourceId, 1, b.getDamageValue(world, x, y, z)));
return drops;
}
// else if(getPlantId() == Blocks.leavesFruit.get().blockID)
// {
// ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
//
// int meta = world.getBlockMetadata(x, y, z);
// if ((meta & 3) == 3)
// {
// drops.add(new ItemStack(Item.appleRed));
// }
// else if ((meta & 3) == 2)
// {
// if(rand.nextInt(16) == 0) drops.add(new ItemStack(Item.appleRed));
// if(rand.nextInt(80) == 0) drops.add(new ItemStack(Block.sapling));
// }
// else if ((meta & 3) == 1)
// {
// if(rand.nextInt(64) == 0) drops.add(new ItemStack(Item.appleRed));
// if(rand.nextInt(40) == 0) drops.add(new ItemStack(Block.sapling));
// }
// else if ((meta & 3) == 0)
// {
// if(rand.nextInt(20) == 0) drops.add(new ItemStack(Block.sapling));
// }
//
// return drops;
// }
else
{
return Block.blocksList[getPlantId()].getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
return b.getBlockDropped(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
}
}