mirror of https://github.com/cabaletta/baritone
Merge branch 'master' into 1.13.2
This commit is contained in:
commit
8268e3ec1b
|
@ -0,0 +1 @@
|
||||||
|
<!-- No UwU's or OwO's allowed -->
|
|
@ -0,0 +1 @@
|
||||||
|
<!-- No UwU's or OwO's allowed -->
|
|
@ -45,6 +45,11 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
|
||||||
permanently any contributor for other behaviors that they deem inappropriate,
|
permanently any contributor for other behaviors that they deem inappropriate,
|
||||||
threatening, offensive, or harmful.
|
threatening, offensive, or harmful.
|
||||||
|
|
||||||
|
Project maintainers have the right and responsibility to immediately remove
|
||||||
|
without any sort of dispute any issues or pull requests that do not align
|
||||||
|
with their corresponding templates. Absolutely no leniancy shall be accepted
|
||||||
|
with these terms.
|
||||||
|
|
||||||
## Scope
|
## Scope
|
||||||
|
|
||||||
This Code of Conduct applies both within project spaces and in public spaces
|
This Code of Conduct applies both within project spaces and in public spaces
|
||||||
|
|
|
@ -89,7 +89,7 @@ minecraft {
|
||||||
environment 'nativesDirectory', extractNatives.output
|
environment 'nativesDirectory', extractNatives.output
|
||||||
|
|
||||||
environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
|
environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
|
||||||
|
|
||||||
if (Os.isFamily(Os.FAMILY_MAC)) {
|
if (Os.isFamily(Os.FAMILY_MAC)) {
|
||||||
jvmArgs "-XstartOnFirstThread"
|
jvmArgs "-XstartOnFirstThread"
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,8 +69,8 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
|
||||||
float oldPitch = ctx.player().rotationPitch;
|
float oldPitch = ctx.player().rotationPitch;
|
||||||
float desiredPitch = this.target.getPitch();
|
float desiredPitch = this.target.getPitch();
|
||||||
ctx.player().rotationPitch = desiredPitch;
|
ctx.player().rotationPitch = desiredPitch;
|
||||||
if (desiredPitch == oldPitch) {
|
if (desiredPitch == oldPitch && Baritone.settings().freeLook.value) {
|
||||||
//nudgeToLevel();
|
nudgeToLevel();
|
||||||
}
|
}
|
||||||
this.target = null;
|
this.target = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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()))) {
|
if (this.goal == null || (this.goal.isInGoal(ctx.playerFeet()) && this.goal.isInGoal(baritone.getPathingBehavior().pathStart()))) {
|
||||||
onLostControl(); // we're there xd
|
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.CANCEL_AND_SET_GOAL);
|
||||||
}
|
}
|
||||||
return new PathingCommand(this.goal, PathingCommandType.SET_GOAL_AND_PATH);
|
return new PathingCommand(this.goal, PathingCommandType.SET_GOAL_AND_PATH);
|
||||||
|
|
|
@ -87,7 +87,6 @@ public class GuiClick extends GuiScreen {
|
||||||
return super.mouseReleased(mouseX, mouseY, mouseButton);
|
return super.mouseReleased(mouseX, mouseY, mouseButton);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
|
public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
|
||||||
clickStart = currentMouseOver;
|
clickStart = currentMouseOver;
|
||||||
|
@ -121,8 +120,6 @@ public class GuiClick extends GuiScreen {
|
||||||
GlStateManager.disableBlend();
|
GlStateManager.disableBlend();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Vec3d toWorld(double x, double y, double z) {
|
public Vec3d toWorld(double x, double y, double z) {
|
||||||
|
|
|
@ -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);
|
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();
|
tessellator.draw();
|
||||||
}
|
}
|
||||||
if (Baritone.settings().renderPathIgnoreDepth.value) {
|
if (Baritone.settings().renderPathIgnoreDepth.value) {
|
||||||
|
@ -190,7 +190,7 @@ public final class PathRenderer implements Helper {
|
||||||
GlStateManager.disableBlend();
|
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 d0 = mc.getRenderManager().viewerPosX;
|
||||||
double d1 = mc.getRenderManager().viewerPosY;
|
double d1 = mc.getRenderManager().viewerPosY;
|
||||||
double d2 = mc.getRenderManager().viewerPosZ;
|
double d2 = mc.getRenderManager().viewerPosZ;
|
||||||
|
|
Loading…
Reference in New Issue