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

Merge branch 'master' of github.com:cabaletta/baritone

Browse Source
This commit is contained in:
Leijurv 2018-08-05 19:21:48 -04:00
commit 3201766617
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
3 changed files with 149 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/baritone/bot/behavior/impl/LookBehavior.java
View File

@ -1,6 +1,44 @@
package baritone.bot.behavior.impl;
import baritone.bot.behavior.Behavior;
import baritone.bot.utils.Utils;
import net.minecraft.util.Tuple;
import net.minecraft.util.math.BlockPos;
import java.util.Optional;
public class LookBehavior extends Behavior {
public static final LookBehavior INSTANCE = new LookBehavior();
public LookBehavior() {
}
/**
* Target's values are as follows:
*
* getFirst() -> yaw
* getSecond() -> pitch
*/
private Optional<Tuple<Float, Float>> target = Optional.empty();
public void updateTarget(BlockPos blockPos) {
Utils.calcRotationFromVec3d(player().getPositionEyes(1.0F),
Utils.calcCenterFromCoords(blockPos, world()));
}
public void updateTarget(Tuple<Float, Float> target) {
this.target = Optional.of(target);
}
@Override
public void onPlayerUpdate() {
if(target.isPresent()) {
player().setPositionAndRotation(player().posX, player().posY, player().posZ,
target.get().getFirst(), target.get().getSecond());
target = Optional.empty();
}
}
}

103
src/main/java/baritone/bot/behavior/impl/LookBehaviorUtils.java Normal file
View File

@ -0,0 +1,103 @@
package baritone.bot.behavior.impl;
import baritone.bot.utils.BlockStateInterface;
import baritone.bot.utils.Helper;
import baritone.bot.utils.Utils;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.Tuple;
import net.minecraft.util.math.*;
import java.util.Optional;
public final class LookBehaviorUtils implements Helper{
public static final Vec3d[] BLOCK_SIDE_MULTIPLIERS = new Vec3d[]{
new Vec3d(0, 0.5, 0.5),
new Vec3d(1, 0.5, 0.5),
new Vec3d(0.5, 0, 0.5),
new Vec3d(0.5, 1, 0.5),
new Vec3d(0.5, 0.5, 0),
new Vec3d(0.5, 0.5, 1)
};
/**
* Calculates a vector given a rotation array
*
* @param rotation {@link LookBehavior#target}
* @return vector of the rotation
*/
public static Vec3d calcVec3dFromRotation(Tuple<Float, Float> rotation) {
float f = MathHelper.cos(-rotation.getFirst() * 0.017453292F - (float) Math.PI);
float f1 = MathHelper.sin(-rotation.getFirst() * 0.017453292F - (float) Math.PI);
float f2 = -MathHelper.cos(-rotation.getSecond() * 0.017453292F);
float f3 = MathHelper.sin(-rotation.getSecond() * 0.017453292F);
return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
}
public static Optional<Tuple<Float, Float>> reachable(BlockPos pos) {
Optional possibleRotation = reachableCenter(pos);
if(possibleRotation.isPresent()) {
return possibleRotation;
}
IBlockState bstate = BlockStateInterface.get(pos);
AxisAlignedBB bbox = bstate.getBoundingBox(mc.world, pos);
for (Vec3d vecMult : BLOCK_SIDE_MULTIPLIERS) {
double xDiff = bbox.minX * vecMult.x + bbox.maxX * (1 - vecMult.x);//lol
double yDiff = bbox.minY * vecMult.y + bbox.maxY * (1 - vecMult.y);
double zDiff = bbox.minZ * vecMult.z + bbox.maxZ * (1 - vecMult.z);
double x = pos.getX() + xDiff;
double y = pos.getY() + yDiff;
double z = pos.getZ() + zDiff;
possibleRotation = reachableRotation(pos, new Vec3d(x, y, z));
if (possibleRotation.isPresent()) {
return possibleRotation;
}
}
return Optional.empty();
}
private static RayTraceResult raytraceTowards(Tuple<Float, Float> rotation) {
double blockReachDistance = (double) mc.playerController.getBlockReachDistance();
Vec3d vec3 = mc.player.getPositionEyes(1.0F);
Vec3d vec31 = calcVec3dFromRotation(rotation);
Vec3d vec32 = vec3.add(vec31.x * blockReachDistance,
vec31.y * blockReachDistance,
vec31.z * blockReachDistance);
return mc.world.rayTraceBlocks(vec3, vec32, false, false, true);
}
/**
* Checks if coordinate is reachable with the given block-face rotation offset
* @param pos
* @param offset
* @return
*/
public static Optional<Tuple<Float, Float>> reachableRotation(BlockPos pos, Vec3d offset) {
Tuple<Float, Float> rotation = Utils.calcRotationFromVec3d(mc.player.getPositionEyes(1.0F),
offset);
RayTraceResult result = raytraceTowards(rotation);
if(result != null
&& result.typeOfHit == RayTraceResult.Type.BLOCK
&& result.getBlockPos().equals(pos))
return Optional.of(rotation);
return Optional.empty();
}
/**
* Checks if center of block at coordinate is reachable
* @param pos
* @return
*/
public static Optional<Tuple<Float, Float>> reachableCenter(BlockPos pos) {
Tuple<Float, Float> rotation = Utils.calcRotationFromVec3d(mc.player.getPositionEyes(1.0F),
Utils.calcCenterFromCoords(pos, mc.world));
RayTraceResult result = raytraceTowards(rotation);
if(result != null
&& result.typeOfHit == RayTraceResult.Type.BLOCK
&& result.getBlockPos().equals(pos))
return Optional.of(rotation);
return Optional.empty();
}
}

8
src/main/java/baritone/bot/utils/Utils.java
View File

@ -1,5 +1,6 @@
package baritone.bot.utils;
import baritone.bot.behavior.impl.LookBehavior;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.Tuple;
import net.minecraft.util.math.AxisAlignedBB;
@ -17,6 +18,13 @@ public final class Utils {
return calcRotationFromVec3d(vec3dFromBlockPos(orig), vec3dFromBlockPos(dest));
}
/**
* Calculates rotation to given Vec<sub>dest</sub> from Vec<sub>orig</sub>
*
* @param orig
* @param dest
* @return Rotation Tuple {@link LookBehavior#target}
*/
public static Tuple<Float, Float> calcRotationFromVec3d(Vec3d orig, Vec3d dest) {
double yaw = Math.atan2(orig.x - dest.x, -orig.z + dest.z);
double dist = Math.sqrt((orig.x - dest.x) * (orig.x - dest.x) + (-orig.x + dest.x) * (-orig.z + dest.z));