From 5f49bedc426dde9ea19708a768dbc3616d7ba029 Mon Sep 17 00:00:00 2001 From: Bella Date: Fri, 28 Feb 2020 17:26:59 -0500 Subject: [PATCH 01/10] Change 1.14 to 1.15 in SETUP.md --- SETUP.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SETUP.md b/SETUP.md index 7efab34ff..ae9e82c43 100644 --- a/SETUP.md +++ b/SETUP.md @@ -2,7 +2,9 @@ The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. -For 1.14.4, [click here](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1). +1.14.4 and lower is located on the [releases](https://github.com/cabaletta/baritone/releases/) page, if you don't want to use Impact. + +For 1.15.2, [click here](https://www.dropbox.com/s/8rx6f0kts9hvd4f/1.15.2-Baritone.zip?dl=1). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. From d6106a44f753974927418a12bfb654acb68ffde5 Mon Sep 17 00:00:00 2001 From: Bella Who Date: Fri, 13 Mar 2020 09:00:17 -0400 Subject: [PATCH 02/10] Remove dropbox link as 1.15.2 is now officially released --- SETUP.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/SETUP.md b/SETUP.md index ae9e82c43..f2e0c303a 100644 --- a/SETUP.md +++ b/SETUP.md @@ -2,9 +2,7 @@ The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. -1.14.4 and lower is located on the [releases](https://github.com/cabaletta/baritone/releases/) page, if you don't want to use Impact. - -For 1.15.2, [click here](https://www.dropbox.com/s/8rx6f0kts9hvd4f/1.15.2-Baritone.zip?dl=1). +1.15.2 and lower is located on the [releases](https://github.com/cabaletta/baritone/releases/) page, if you don't want to use Impact. Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. From ac2a88d186384199037849d48e444897082b8bfd Mon Sep 17 00:00:00 2001 From: Leijurv Date: Wed, 25 Mar 2020 21:50:12 -0700 Subject: [PATCH 03/10] Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9bc29c667..3fb823cb3 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 04/10] 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 3fb823cb3..9bc29c667 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 05/10] 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 87ab45106..1a3faf57b 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)); From 0e7bf25de72c4607aa360b59ac5b0a7c567e5fb7 Mon Sep 17 00:00:00 2001 From: Dominika Date: Thu, 9 Apr 2020 17:01:26 -0400 Subject: [PATCH 06/10] fix setup.md as per leij's recommendations --- SETUP.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SETUP.md b/SETUP.md index f2e0c303a..ff16acbb9 100644 --- a/SETUP.md +++ b/SETUP.md @@ -2,7 +2,7 @@ The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. -1.15.2 and lower is located on the [releases](https://github.com/cabaletta/baritone/releases/) page, if you don't want to use Impact. +You can also use a custom version json for Minecraft, with the [1.14.4](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1) version or the [1.15.2](https://www.dropbox.com/s/8rx6f0kts9hvd4f/1.15.2-Baritone.zip?dl=1) version Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it. From ec92ab8b39a2aa4e97471acc25eec4b10d380b42 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Sat, 18 Apr 2020 22:07:18 -0700 Subject: [PATCH 07/10] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9bc29c667..75ce55135 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ # Baritone +[![HitCount](http://hits.dwyl.com/cabaletta/baritone.svg)](http://hits.dwyl.com/cabaletta/baritone/) +[![GitHub All Releases](https://img.shields.io/github/downloads/cabaletta/baritone/total.svg)](https://github.com/cabaletta/baritone/releases/) + [![Build Status](https://travis-ci.com/cabaletta/baritone.svg?branch=master)](https://travis-ci.com/cabaletta/baritone/) [![Release](https://img.shields.io/github/release/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/releases/) [![License](https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg)](LICENSE) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400)](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&utm_medium=referral&utm_content=cabaletta/baritone&utm_campaign=Badge_Grade) -[![HitCount](http://hits.dwyl.com/cabaletta/baritone.svg)](http://hits.dwyl.com/cabaletta/baritone/) -[![GitHub All Releases](https://img.shields.io/github/downloads/cabaletta/baritone/total.svg)](https://github.com/cabaletta/baritone/releases/) [![Minecraft](https://img.shields.io/badge/MC-1.12.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/master/) [![Minecraft](https://img.shields.io/badge/MC-1.13.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.13.2/) [![Minecraft](https://img.shields.io/badge/MC-1.14.4-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.14.4/) From 33d4dd47bb2814367e373f1891e2ef4233cdf232 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Tue, 21 Apr 2020 12:02:07 -0700 Subject: [PATCH 08/10] v1.2.14 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ce97e61cc..a91926ddb 100755 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ */ group 'baritone' -version '1.2.13' +version '1.2.14' buildscript { repositories { From 2a830b6b68e396b7993afd37d129b48cc6cda4ed Mon Sep 17 00:00:00 2001 From: Leijurv Date: Tue, 21 Apr 2020 12:05:09 -0700 Subject: [PATCH 09/10] v1.3.8 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8b1649d24..a5edf8bcb 100755 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ */ group 'baritone' -version '1.3.7' +version '1.3.8' buildscript { repositories { From fe0b54cfb403cba57c7eb810fcb67a233840c609 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Tue, 21 Apr 2020 12:23:47 -0700 Subject: [PATCH 10/10] v1.4.6 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f6ea01a5c..91cb0a091 100755 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ */ group 'baritone' -version '1.4.5' +version '1.4.6' buildscript { repositories {