0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consolidate rayTraceTowards into RayTraceUtils, fixes #121

Browse Source
This commit is contained in:
Brady 2018-09-02 14:21:34 -05:00
parent 115b8553b2
commit 0e6d61e907
No known key found for this signature in database
GPG Key ID: 73A788379A197567
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/baritone/behavior/impl/LookBehaviorUtils.java
View File

@ -17,10 +17,7 @@
package baritone.behavior.impl; package baritone.behavior.impl;
import baritone.utils.BlockStateInterface; import baritone.utils.*;
import baritone.utils.Helper;
import baritone.utils.Rotation;
import baritone.utils.Utils;
import net.minecraft.block.BlockFire; import net.minecraft.block.BlockFire;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.*; import net.minecraft.util.math.*;
@ -87,18 +84,6 @@ public final class LookBehaviorUtils implements Helper {
return Optional.empty(); return Optional.empty();
} }
private static RayTraceResult rayTraceTowards(Rotation rotation) {
double blockReachDistance = mc.playerController.getBlockReachDistance();
Vec3d start = mc.player.getPositionEyes(1.0F);
Vec3d direction = calcVec3dFromRotation(rotation);
Vec3d end = start.add(
direction.x * blockReachDistance,
direction.y * blockReachDistance,
direction.z * blockReachDistance
);
return mc.world.rayTraceBlocks(start, end, false, false, true);
}
/** /**
* Checks if coordinate is reachable with the given block-face rotation offset * Checks if coordinate is reachable with the given block-face rotation offset
* *
@ -108,7 +93,7 @@ public final class LookBehaviorUtils implements Helper {
*/ */
protected static Optional<Rotation> reachableOffset(BlockPos pos, Vec3d offsetPos) { protected static Optional<Rotation> reachableOffset(BlockPos pos, Vec3d offsetPos) {
Rotation rotation = Utils.calcRotationFromVec3d(mc.player.getPositionEyes(1.0F), offsetPos); Rotation rotation = Utils.calcRotationFromVec3d(mc.player.getPositionEyes(1.0F), offsetPos);
RayTraceResult result = rayTraceTowards(rotation); RayTraceResult result = RayTraceUtils.rayTraceTowards(rotation);
System.out.println(result); System.out.println(result);
if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) { if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
if (result.getBlockPos().equals(pos)) { if (result.getBlockPos().equals(pos)) {

15
src/main/java/baritone/utils/RayTraceUtils.java
View File

@ -18,6 +18,9 @@
package baritone.utils; package baritone.utils;
import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import static baritone.behavior.impl.LookBehaviorUtils.calcVec3dFromRotation;
/** /**
* @author Brady * @author Brady
@ -44,4 +47,16 @@ public final class RayTraceUtils implements Helper {
return result; return result;
} }
public static RayTraceResult rayTraceTowards(Rotation rotation) {
double blockReachDistance = mc.playerController.getBlockReachDistance();
Vec3d start = mc.player.getPositionEyes(1.0F);
Vec3d direction = calcVec3dFromRotation(rotation);
Vec3d end = start.add(
direction.x * blockReachDistance,
direction.y * blockReachDistance,
direction.z * blockReachDistance
);
return mc.world.rayTraceBlocks(start, end, false, false, true);
}
} }