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

Merge branch 'master' into 1.13.2

Browse Source
This commit is contained in:
Leijurv
2019-03-21 15:51:36 -07:00
parent af91da6a28 bd64f73842
commit 8268e3ec1b
8 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/baritone/behavior/LookBehavior.java
View File

@@ -69,8 +69,8 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
float oldPitch = ctx.player().rotationPitch;
float desiredPitch = this.target.getPitch();
ctx.player().rotationPitch = desiredPitch;
if (desiredPitch == oldPitch) {
//nudgeToLevel();
if (desiredPitch == oldPitch && Baritone.settings().freeLook.value) {
nudgeToLevel();
}
this.target = null;
}

3
src/main/java/baritone/process/CustomGoalProcess.java
View File

@@ -90,6 +90,9 @@ public class CustomGoalProcess extends BaritoneProcessHelper implements ICustomG
}
if (this.goal == null || (this.goal.isInGoal(ctx.playerFeet()) && this.goal.isInGoal(baritone.getPathingBehavior().pathStart()))) {
onLostControl(); // we're there xd
if (Baritone.settings().disconnectOnArrival.value) {
ctx.world().sendQuittingDisconnectingPacket();
}
return new PathingCommand(this.goal, PathingCommandType.CANCEL_AND_SET_GOAL);
}
return new PathingCommand(this.goal, PathingCommandType.SET_GOAL_AND_PATH);

3
src/main/java/baritone/utils/GuiClick.java
View File

@@ -87,7 +87,6 @@ public class GuiClick extends GuiScreen {
return super.mouseReleased(mouseX, mouseY, mouseButton);
}
@Override
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
clickStart = currentMouseOver;
@@ -121,8 +120,6 @@ public class GuiClick extends GuiScreen {
GlStateManager.disableBlend();
}
}
}
public Vec3d toWorld(double x, double y, double z) {

4
src/main/java/baritone/utils/PathRenderer.java
View File

@@ -178,7 +178,7 @@ public final class PathRenderer implements Helper {
}
GlStateManager.color4f(color.getColorComponents(null)[0], color.getColorComponents(null)[1], color.getColorComponents(null)[2], alpha);
}
drawLine(player, x1, y1, z1, x2, y2, z2);
drawLine(x1, y1, z1, x2, y2, z2);
tessellator.draw();
}
if (Baritone.settings().renderPathIgnoreDepth.value) {
@@ -190,7 +190,7 @@ public final class PathRenderer implements Helper {
GlStateManager.disableBlend();
}
public static void drawLine(Entity player, double bp1x, double bp1y, double bp1z, double bp2x, double bp2y, double bp2z) {
public static void drawLine(double bp1x, double bp1y, double bp1z, double bp2x, double bp2y, double bp2z) {
double d0 = mc.getRenderManager().viewerPosX;
double d1 = mc.getRenderManager().viewerPosY;
double d2 = mc.getRenderManager().viewerPosZ;