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

Merge pull request #863 from GirafiStudios/leaves_drop_fix

Browse source 
Fixed that shearing of BoP leaves still dropped fruits & saplings, Closes #859
This commit is contained in:
Forstride 2016-09-09 22:39:17 -04:00 committed by GitHub
commit 0a8c1600a7
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java
View file

@ -8,15 +8,11 @@
package biomesoplenty.common.block;
import java.util.List;
import java.util.Random;
import com.google.common.collect.Lists;
import biomesoplenty.api.enums.BOPTrees;
import biomesoplenty.api.item.BOPItems;
import biomesoplenty.common.item.ItemBOPBlock;
import biomesoplenty.common.util.block.VariantPagingHelper;
import com.google.common.collect.Lists;
import net.minecraft.block.BlockLeaves;
import net.minecraft.block.BlockPlanks;
import net.minecraft.block.properties.IProperty;
@ -31,6 +27,8 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.StatList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@ -42,6 +40,10 @@ import net.minecraft.world.biome.BiomeColorHelper;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Random;
// TODO: using fast graphics - transparent color is always rendered as black - can we override this somehow?
// TODO: using fast graphics - flowering leaves overlay seems to be tinted green - I think that is because it doesn't use distinct tintindexes on fast graphics
// In older versions a completely different single texture could be used for fast graphics, but I'm not sure that's an option any more
@ -224,7 +226,7 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
}
@Override
public java.util.List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune)
{
BOPTrees treeType = ((BOPTrees) state.getValue(this.variantProperty));
@ -357,10 +359,22 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
spawnAsEntity(worldIn, pos, fruit);
}
}
@Override
public List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune)
public void harvestBlock(World worldIn, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, @Nullable ItemStack stack)
{
if (!worldIn.isRemote && stack != null && stack.getItem() == Items.SHEARS)
{
player.addStat(StatList.getBlockStats(this));
}
else
{
super.harvestBlock(worldIn, player, pos, state, te, stack);
}
}
@Override
public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune)
{
List<ItemStack> ret = new java.util.ArrayList<ItemStack>();
IBlockState state = world.getBlockState(pos);