Anvilcraft/ModularPowersuits
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

split up block and entity raytracing

Browse source
This commit is contained in:
MachineMuse 2013-03-13 18:57:57 -06:00
parent 4f17629939
commit 5bd3759dd6
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/minecraft/net/machinemuse/api/MusePlayerUtils.java
View file

@ -11,9 +11,8 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.World; import net.minecraft.world.World;
public class MusePlayerUtils { public class MusePlayerUtils {
public static MovingObjectPosition raytraceEntities(World world, EntityPlayer player, boolean collisionFlag, double reachDistance) {
public static MovingObjectPosition doCustomRayTrace(World world, EntityPlayer player, boolean collisionFlag, double reachDistance)
{
MovingObjectPosition pickedEntity = null; MovingObjectPosition pickedEntity = null;
Vec3 playerPosition = Vec3.createVectorHelper(player.posX, player.posY + player.getEyeHeight(), player.posZ); Vec3 playerPosition = Vec3.createVectorHelper(player.posX, player.posY + player.getEyeHeight(), player.posZ);
Vec3 playerLook = player.getLookVec(); Vec3 playerLook = player.getLookVec();
@ -65,17 +64,35 @@ public class MusePlayerUtils {
} }
} }
} }
return pickedEntity;
}
public static MovingObjectPosition raytraceBlocks(World world, EntityPlayer player, boolean collisionFlag, double reachDistance) {
Vec3 playerPosition = Vec3.createVectorHelper(player.posX, player.posY + player.getEyeHeight(), player.posZ);
Vec3 playerLook = player.getLookVec();
Vec3 playerViewOffset = Vec3.createVectorHelper(
playerPosition.xCoord + playerLook.xCoord * reachDistance,
playerPosition.yCoord + playerLook.yCoord * reachDistance,
playerPosition.zCoord + playerLook.zCoord * reachDistance);
return world.rayTraceBlocks_do_do(playerPosition, playerViewOffset, collisionFlag, !collisionFlag);
}
public static MovingObjectPosition doCustomRayTrace(World world, EntityPlayer player, boolean collisionFlag, double reachDistance)
{
// Somehow this destroys the playerPosition vector -.- // Somehow this destroys the playerPosition vector -.-
MovingObjectPosition pickedBlock = world.rayTraceBlocks_do_do(playerPosition, playerViewOffset, collisionFlag, !collisionFlag); MovingObjectPosition pickedBlock = raytraceBlocks(world, player, collisionFlag, reachDistance);
MovingObjectPosition pickedEntity = raytraceEntities(world, player, collisionFlag, reachDistance);
if (pickedBlock == null) { if (pickedBlock == null) {
return pickedEntity; return pickedEntity;
} else if (pickedEntity == null) { } else if (pickedEntity == null) {
return pickedBlock; return pickedBlock;
} else { } else {
playerPosition = Vec3.createVectorHelper(player.posX, player.posY + player.getEyeHeight(), player.posZ); Vec3 playerPosition = Vec3.createVectorHelper(player.posX, player.posY + player.getEyeHeight(), player.posZ);
double dBlock = pickedBlock.hitVec.distanceTo(playerPosition); double dBlock = pickedBlock.hitVec.distanceTo(playerPosition);
if (closestEntity < dBlock) { double dEntity = pickedEntity.hitVec.distanceTo(playerPosition);
if (dEntity < dBlock) {
return pickedEntity; return pickedEntity;
} else { } else {
return pickedBlock; return pickedBlock;