From ac2a88d186384199037849d48e444897082b8bfd Mon Sep 17 00:00:00 2001 From: Leijurv Date: Wed, 25 Mar 2020 21:50:12 -0700 Subject: [PATCH 1/3] Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9bc29c66..3fb823cb 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,13 @@ A Minecraft pathfinder bot. Baritone is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#0730 on Baritone which I recommend. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do. -The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the v1.2.* forge api jar from [releases](https://github.com/cabaletta/baritone/releases). Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. +By far the easiest and most user-friendly way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. -For 1.15.2, [click here](https://www.youtube.com/watch?v=j1qKtCZFURM) and see description. +The second easiest way (for 1.12.2 Forge or 1.15.2 Forge only) is to install the v1.2.* or v1.5.* (respectively) "forge-api" jar from [releases](https://github.com/cabaletta/baritone/releases). For 1.12.2, click [here](https://github.com/cabaletta/baritone/releases/download/v1.2.13/baritone-api-forge-1.2.13.jar). For 1.15.2 you will also need a second mod to allow Baritone's forge mod to work. Mod 1 (baritone) is [here](https://github.com/cabaletta/baritone/releases/download/v1.5.3/baritone-api-forge-1.5.3.jar). Mod 2 (mixinbootstrap) is [here](https://github.com/LXGaming/MixinBootstrap/releases/download/v1.0.2/MixinBootstrap-1.0.2.jar). They must go in `mods`. Not in `mods/1.15.2` or anything. Otherwise, see [Installation & setup](SETUP.md). + +For 1.15.2 vanilla version (no Forge), [click here](https://www.youtube.com/watch?v=j1qKtCZFURM) and see description. + +Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. This project is an updated version of [MineBot](https://github.com/leijurv/MineBot/), the original version of the bot for Minecraft 1.8.9, rebuilt for 1.12.2 through 1.15.2. Baritone focuses on reliability and particularly performance (it's over [30x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths). From 3cc4c0ea98a41166705d9b97281c1b54d92ff1b0 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Wed, 25 Mar 2020 21:52:42 -0700 Subject: [PATCH 2/3] Revert "Update README.md" This reverts commit ac2a88d186384199037849d48e444897082b8bfd. --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3fb823cb..9bc29c66 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,9 @@ A Minecraft pathfinder bot. Baritone is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#0730 on Baritone which I recommend. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do. -By far the easiest and most user-friendly way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. +The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the v1.2.* forge api jar from [releases](https://github.com/cabaletta/baritone/releases). Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. -The second easiest way (for 1.12.2 Forge or 1.15.2 Forge only) is to install the v1.2.* or v1.5.* (respectively) "forge-api" jar from [releases](https://github.com/cabaletta/baritone/releases). For 1.12.2, click [here](https://github.com/cabaletta/baritone/releases/download/v1.2.13/baritone-api-forge-1.2.13.jar). For 1.15.2 you will also need a second mod to allow Baritone's forge mod to work. Mod 1 (baritone) is [here](https://github.com/cabaletta/baritone/releases/download/v1.5.3/baritone-api-forge-1.5.3.jar). Mod 2 (mixinbootstrap) is [here](https://github.com/LXGaming/MixinBootstrap/releases/download/v1.0.2/MixinBootstrap-1.0.2.jar). They must go in `mods`. Not in `mods/1.15.2` or anything. Otherwise, see [Installation & setup](SETUP.md). - -For 1.15.2 vanilla version (no Forge), [click here](https://www.youtube.com/watch?v=j1qKtCZFURM) and see description. - -Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. +For 1.15.2, [click here](https://www.youtube.com/watch?v=j1qKtCZFURM) and see description. This project is an updated version of [MineBot](https://github.com/leijurv/MineBot/), the original version of the bot for Minecraft 1.8.9, rebuilt for 1.12.2 through 1.15.2. Baritone focuses on reliability and particularly performance (it's over [30x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths). From e218ced2c786ef0e3f42bce758ab9ed7384e7593 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Mon, 30 Mar 2020 22:23:43 -0700 Subject: [PATCH 3/3] i hate myself --- src/main/java/baritone/pathing/movement/MovementHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index 87ab4510..1a3faf57 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -521,7 +521,7 @@ public interface MovementHelper extends ActionCosts, Helper { double faceX = (placeAt.getX() + against1.getX() + 1.0D) * 0.5D; double faceY = (placeAt.getY() + against1.getY() + 0.5D) * 0.5D; double faceZ = (placeAt.getZ() + against1.getZ() + 1.0D) * 0.5D; - Rotation place = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations()); + Rotation place = RotationUtils.calcRotationFromVec3d(wouldSneak ? RayTraceUtils.inferSneakingEyePosition(ctx.player()) : ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations()); RayTraceResult res = RayTraceUtils.rayTraceTowards(ctx.player(), place, ctx.playerController().getBlockReachDistance(), wouldSneak); if (res != null && res.typeOfHit == RayTraceResult.Type.BLOCK && res.getBlockPos().equals(against1) && res.getBlockPos().offset(res.sideHit).equals(placeAt)) { state.setTarget(new MovementState.MovementTarget(place, true));