maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Work on Advanced Drill (#1411)

Browse source 
* Raytracing for drill
* Stop crashes if raytrace is somehow null
* getCount() already checks for emptiness I think
This commit is contained in:
temp1011 2018-01-19 07:07:40 +00:00 committed by drcrazy
parent 8e12543902
commit 91a56077d8
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/techreborn/items/tools/ItemAdvancedDrill.java
View file

@ -24,6 +24,7 @@
package techreborn.items.tools;
import codechicken.lib.raytracer.RayTracer;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
@ -35,6 +36,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.BlockEvent;
@ -77,13 +79,12 @@ public class ItemAdvancedDrill extends ItemDrill {
@Override
public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) {
//TODO raytrace
EnumFacing enumfacing = entityLiving.getHorizontalFacing().getOpposite();
if (entityLiving.rotationPitch < -50) {
enumfacing = EnumFacing.DOWN;
} else if (entityLiving.rotationPitch > 50) {
enumfacing = EnumFacing.UP;
}
if(!(entityLiving instanceof EntityPlayer))
return false;
RayTraceResult raytrace= RayTracer.retrace((EntityPlayer) entityLiving);
if(raytrace==null)
return false;
EnumFacing enumfacing = raytrace.sideHit;
if (enumfacing == EnumFacing.SOUTH || enumfacing == EnumFacing.NORTH) {
for (int i = -1; i < 2; i++) {
for (int j = -1; j < 2; j++) {
@ -125,7 +126,7 @@ public class ItemAdvancedDrill extends ItemDrill {
BlockEvent.HarvestDropsEvent event = new BlockEvent.HarvestDropsEvent(world, pos, blockState, 0, 1, dropList, (EntityPlayer) entityLiving, false);
MinecraftForge.EVENT_BUS.post(event);
for (ItemStack drop : dropList) {
if (!drop.isEmpty() && drop.getCount() > 0) {
if (drop.getCount() > 0) {
stuff.add(drop);
}
}