From 65902d556e5b2ea30ccfd584366854767ccb4cce Mon Sep 17 00:00:00 2001 From: Leijurv Date: Tue, 19 Mar 2019 18:22:22 -0700 Subject: [PATCH 01/10] v1.2.5 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a49bfd767..739e3d352 100755 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ */ group 'baritone' -version '1.2.4' +version '1.2.5' buildscript { repositories { From 8c4e778506f82a8e10740032907d5acf28e16026 Mon Sep 17 00:00:00 2001 From: babbaj Date: Tue, 19 Mar 2019 01:48:16 -0400 Subject: [PATCH 02/10] Create ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/ISSUE_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..d0e034d0e --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1 @@ + From 3f6af517139f81c4b74b4d5e80098bfb7eb5b6f9 Mon Sep 17 00:00:00 2001 From: babbaj Date: Tue, 19 Mar 2019 01:53:09 -0400 Subject: [PATCH 03/10] Create PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..d0e034d0e --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1 @@ + From a07fae6cdd530e7e925a874ddac401c248a199a4 Mon Sep 17 00:00:00 2001 From: Brady Date: Tue, 19 Mar 2019 21:25:58 -0500 Subject: [PATCH 04/10] Update Code of Conduct to include templates --- CODE_OF_CONDUCT.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ae74fc3e4..37c1b703a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -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, 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 This Code of Conduct applies both within project spaces and in public spaces From 7ab2cd2a4587c3df705e4d804f5d4c17a1cdc2ca Mon Sep 17 00:00:00 2001 From: Brady Date: Tue, 19 Mar 2019 21:26:47 -0500 Subject: [PATCH 05/10] Update ISSUE_TEMPLATE.md --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index d0e034d0e..e9a3c7cc1 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1 +1 @@ - + From 32ac46c8a9d371504fd21939b898250db7cc870d Mon Sep 17 00:00:00 2001 From: Brady Date: Tue, 19 Mar 2019 21:26:58 -0500 Subject: [PATCH 06/10] Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d0e034d0e..e9a3c7cc1 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1 +1 @@ - + From 54ed6ce5a5b58f72bdcb69796664a0505b6431b1 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Wed, 20 Mar 2019 22:55:40 -0700 Subject: [PATCH 07/10] crucial code formatting --- src/main/java/baritone/utils/GuiClick.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index c928d1f1a..ab65667d3 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -87,7 +87,6 @@ public class GuiClick extends GuiScreen { clickStart = null; } - @Override protected void mouseClicked(int mouseX, int mouseY, int mouseButton) { clickStart = currentMouseOver; From 04ff365890692a82d7653a80289bea02ea5a1f7d Mon Sep 17 00:00:00 2001 From: Leijurv Date: Wed, 20 Mar 2019 23:03:06 -0700 Subject: [PATCH 08/10] what about if i delete two (2) empty lines --- src/main/java/baritone/utils/GuiClick.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index ab65667d3..0b412b925 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -119,8 +119,6 @@ public class GuiClick extends GuiScreen { GlStateManager.disableBlend(); } } - - } public Vec3d toWorld(double x, double y, double z) { From cac653ddd9430c03e17462c4725bb36f30d3bf44 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Wed, 20 Mar 2019 23:06:14 -0700 Subject: [PATCH 09/10] little cleanup --- src/main/java/baritone/behavior/LookBehavior.java | 4 ++-- src/main/java/baritone/utils/PathRenderer.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/baritone/behavior/LookBehavior.java b/src/main/java/baritone/behavior/LookBehavior.java index fc3a63707..4d2266179 100644 --- a/src/main/java/baritone/behavior/LookBehavior.java +++ b/src/main/java/baritone/behavior/LookBehavior.java @@ -72,8 +72,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; } diff --git a/src/main/java/baritone/utils/PathRenderer.java b/src/main/java/baritone/utils/PathRenderer.java index 9840e76ec..0c9a45f34 100644 --- a/src/main/java/baritone/utils/PathRenderer.java +++ b/src/main/java/baritone/utils/PathRenderer.java @@ -175,7 +175,7 @@ public final class PathRenderer implements Helper { } GlStateManager.color(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) { @@ -187,7 +187,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; From bd64f73842a84ffb9877a91ee3529be2a3ea4609 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Thu, 21 Mar 2019 15:44:20 -0700 Subject: [PATCH 10/10] fix disconnect on arrival not firing for custom goal process --- src/main/java/baritone/process/CustomGoalProcess.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/baritone/process/CustomGoalProcess.java b/src/main/java/baritone/process/CustomGoalProcess.java index fe361ad6a..4003b7a7a 100644 --- a/src/main/java/baritone/process/CustomGoalProcess.java +++ b/src/main/java/baritone/process/CustomGoalProcess.java @@ -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);