From 12ec7ea990667fdc996da255b82360c67f80ad7b Mon Sep 17 00:00:00 2001 From: Brady Date: Sun, 2 Sep 2018 18:01:41 -0500 Subject: [PATCH 01/11] Update README.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 29771860..c3dd39ab 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,12 @@ PathingBehavior.INSTANCE.setGoal(new GoalXZ(10000, 20000)); PathingBehavior.INSTANCE.path(); ``` -# Can I use Baritone as a library in my hacked client? +# FAQ + +## Can I use Baritone as a library in my hacked client? Sure! -# How is it so fast? +## How is it so fast? -Magic \ No newline at end of file +Magic From 5dbf1014b313b36d416d5e11f051c0e25131f19c Mon Sep 17 00:00:00 2001 From: Brady Date: Sun, 2 Sep 2018 21:28:55 -0500 Subject: [PATCH 02/11] Fix usage of characters that can't be mapped to ascii --- src/main/java/baritone/utils/Helper.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/baritone/utils/Helper.java b/src/main/java/baritone/utils/Helper.java index c973b1ca..ffb0f21b 100755 --- a/src/main/java/baritone/utils/Helper.java +++ b/src/main/java/baritone/utils/Helper.java @@ -33,7 +33,13 @@ import net.minecraft.util.text.TextFormatting; */ public interface Helper { - ITextComponent MESSAGE_PREFIX = new TextComponentString("§5[§dBaritone§5]§7"); + ITextComponent MESSAGE_PREFIX = new TextComponentString(String.format( + "%s[%sBaritone%s]%s", + TextFormatting.DARK_PURPLE, + TextFormatting.LIGHT_PURPLE, + TextFormatting.DARK_PURPLE, + TextFormatting.GRAY + )); Minecraft mc = Minecraft.getMinecraft(); From 31a87a8938e5b4fd4a2d71cee7d72a6926b78e04 Mon Sep 17 00:00:00 2001 From: Brady Date: Sun, 2 Sep 2018 23:26:57 -0500 Subject: [PATCH 03/11] Added travis badge to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c3dd39ab..63bc2c8b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![](https://travis-ci.com/cabaletta/baritone.svg?branch=master) + # Baritone A Minecraft bot. This project is an updated version of [Minebot](https://github.com/leijurv/MineBot/), the original version of the bot for Minecraft 1.8, rebuilt for 1.12.2. From 5151c7770365d3cea12742c25fa471094dc3af2d Mon Sep 17 00:00:00 2001 From: Leijurv Date: Mon, 3 Sep 2018 09:25:44 -0700 Subject: [PATCH 04/11] Move badge below header --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 63bc2c8b..d69f76e9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ +# Baritone ![](https://travis-ci.com/cabaletta/baritone.svg?branch=master) -# Baritone A Minecraft bot. This project is an updated version of [Minebot](https://github.com/leijurv/MineBot/), the original version of the bot for Minecraft 1.8, rebuilt for 1.12.2. From c2fc241d893fa2ef592324c5f900375e406cf73e Mon Sep 17 00:00:00 2001 From: Leijurv Date: Mon, 3 Sep 2018 10:04:48 -0700 Subject: [PATCH 05/11] impact integration instructions --- IMPACT.md | 16 ++++++++++++++++ README.md | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 IMPACT.md diff --git a/IMPACT.md b/IMPACT.md new file mode 100644 index 00000000..52934a64 --- /dev/null +++ b/IMPACT.md @@ -0,0 +1,16 @@ +# Integration between Baritone and Impact + +Baritone will be in Impact 4.4 with nice integrations with its hacks, but if you're impatient you can run Baritone on top of Impact 4.3 right now. + +First, clone and setup Baritone (instructions in main README.md). + +Then, build the jar. From the command line, it's `./gradlew build` (or `gradlew build` on Windows). In IntelliJ, you can just start the `build` task in the Gradle menu. + +Then, copy it into place. It should be `build/libs/baritone-1.0.0.jar` in baritone. Copy it to your libraries in your Minecraft install. For example, on Mac I do `cp Documents/baritone/build/libs/baritone-1.0.0.jar Library/Application\ Support/minecraft/libraries/cabaletta/baritone/1.0/baritone-1.0.jar`. The first time you'll need to make the directory `cabaletta/baritone/1.0` in libraries first. + +Then, we'll need to modify the Impact launch json. Open `minecraft/versions/1.12.2-Impact_4.3/1.12.2-Impact_4.3.json`. + +- Add the Baritone tweak class to line 7 "minecraftArguments" like so: `"minecraftArguments": " ... --tweakClass clientapi.load.ClientTweaker --tweakClass baritone.launch.BaritoneTweakerOptifine",`. You need the Optifine tweaker even though there is no Optifine involved, for reasons I don't quite understand. +- Add the Baritone library. Insert `{ "name": "cabaletta:baritone:1.0" },` between Impact and ClientAPI, which should be between lines 15 and 16. + +Restart the Minecraft launcher, then load Impact 4.3 as normal, and it should now include Baritone. \ No newline at end of file diff --git a/README.md b/README.md index d69f76e9..63d241e4 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ the original version of the bot for Minecraft 1.8, rebuilt for 1.12.2. Features +Baritone + Impact + # Setup - Open the project in IntelliJ as a Gradle project - Run the Gradle task `setupDecompWorkspace` From b3b9bb8aa523c8df64b1f0b9d88b5ea023735b0a Mon Sep 17 00:00:00 2001 From: Leijurv Date: Mon, 3 Sep 2018 10:11:42 -0700 Subject: [PATCH 06/11] prebuilt jar --- IMPACT.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IMPACT.md b/IMPACT.md index 52934a64..29b15aea 100644 --- a/IMPACT.md +++ b/IMPACT.md @@ -2,11 +2,11 @@ Baritone will be in Impact 4.4 with nice integrations with its hacks, but if you're impatient you can run Baritone on top of Impact 4.3 right now. -First, clone and setup Baritone (instructions in main README.md). +You can either build Baritone yourself, or download the jar from Septmeber 3 from here -Then, build the jar. From the command line, it's `./gradlew build` (or `gradlew build` on Windows). In IntelliJ, you can just start the `build` task in the Gradle menu. +To build it yourself, clone and setup Baritone (instructions in main README.md). Then, build the jar. From the command line, it's `./gradlew build` (or `gradlew build` on Windows). In IntelliJ, you can just start the `build` task in the Gradle menu. -Then, copy it into place. It should be `build/libs/baritone-1.0.0.jar` in baritone. Copy it to your libraries in your Minecraft install. For example, on Mac I do `cp Documents/baritone/build/libs/baritone-1.0.0.jar Library/Application\ Support/minecraft/libraries/cabaletta/baritone/1.0/baritone-1.0.jar`. The first time you'll need to make the directory `cabaletta/baritone/1.0` in libraries first. +Copy the jar into place. It should be `build/libs/baritone-1.0.0.jar` in baritone. Copy it to your libraries in your Minecraft install. For example, on Mac I do `cp Documents/baritone/build/libs/baritone-1.0.0.jar Library/Application\ Support/minecraft/libraries/cabaletta/baritone/1.0/baritone-1.0.jar`. The first time you'll need to make the directory `cabaletta/baritone/1.0` in libraries first. Then, we'll need to modify the Impact launch json. Open `minecraft/versions/1.12.2-Impact_4.3/1.12.2-Impact_4.3.json`. From dcfc7a1bd6c10a2e5710f94f2aed94abcbdaf5ff Mon Sep 17 00:00:00 2001 From: Leijurv Date: Mon, 3 Sep 2018 10:13:11 -0700 Subject: [PATCH 07/11] added note --- IMPACT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IMPACT.md b/IMPACT.md index 29b15aea..7e1cc6a4 100644 --- a/IMPACT.md +++ b/IMPACT.md @@ -6,7 +6,7 @@ You can either build Baritone yourself, or download the jar from Septmeber 3 fro To build it yourself, clone and setup Baritone (instructions in main README.md). Then, build the jar. From the command line, it's `./gradlew build` (or `gradlew build` on Windows). In IntelliJ, you can just start the `build` task in the Gradle menu. -Copy the jar into place. It should be `build/libs/baritone-1.0.0.jar` in baritone. Copy it to your libraries in your Minecraft install. For example, on Mac I do `cp Documents/baritone/build/libs/baritone-1.0.0.jar Library/Application\ Support/minecraft/libraries/cabaletta/baritone/1.0/baritone-1.0.jar`. The first time you'll need to make the directory `cabaletta/baritone/1.0` in libraries first. +Copy the jar into place. It should be `build/libs/baritone-1.0.0.jar` in baritone. Copy it to your libraries in your Minecraft install. Note the rename from `baritone-1.0.0.jar` to `baritone-1.0.jar`. For example, on Mac I do `cp Documents/baritone/build/libs/baritone-1.0.0.jar Library/Application\ Support/minecraft/libraries/cabaletta/baritone/1.0/baritone-1.0.jar`. The first time you'll need to make the directory `cabaletta/baritone/1.0` in libraries first. Then, we'll need to modify the Impact launch json. Open `minecraft/versions/1.12.2-Impact_4.3/1.12.2-Impact_4.3.json`. From da67c4aca9075f50a431eeb51eb27b19edaad2dd Mon Sep 17 00:00:00 2001 From: Brady Date: Mon, 3 Sep 2018 12:42:00 -0500 Subject: [PATCH 08/11] Make some changes to the Impact installation --- IMPACT.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/IMPACT.md b/IMPACT.md index 7e1cc6a4..b57a0dfe 100644 --- a/IMPACT.md +++ b/IMPACT.md @@ -2,15 +2,15 @@ Baritone will be in Impact 4.4 with nice integrations with its hacks, but if you're impatient you can run Baritone on top of Impact 4.3 right now. -You can either build Baritone yourself, or download the jar from Septmeber 3 from here +You can either build Baritone yourself, or download the jar from Steptember 3 from here To build it yourself, clone and setup Baritone (instructions in main README.md). Then, build the jar. From the command line, it's `./gradlew build` (or `gradlew build` on Windows). In IntelliJ, you can just start the `build` task in the Gradle menu. -Copy the jar into place. It should be `build/libs/baritone-1.0.0.jar` in baritone. Copy it to your libraries in your Minecraft install. Note the rename from `baritone-1.0.0.jar` to `baritone-1.0.jar`. For example, on Mac I do `cp Documents/baritone/build/libs/baritone-1.0.0.jar Library/Application\ Support/minecraft/libraries/cabaletta/baritone/1.0/baritone-1.0.jar`. The first time you'll need to make the directory `cabaletta/baritone/1.0` in libraries first. +Copy the jar into place. It should be `build/libs/baritone-1.0.0.jar` in baritone. Copy it to your libraries in your Minecraft install. For example, on Mac I do `cp Documents/baritone/build/libs/baritone-1.0.0.jar Library/Application\ Support/minecraft/libraries/cabaletta/baritone/1.0.0/baritone-1.0.0.jar`. The first time you'll need to make the directory `cabaletta/baritone/1.0.0` in libraries first. Then, we'll need to modify the Impact launch json. Open `minecraft/versions/1.12.2-Impact_4.3/1.12.2-Impact_4.3.json`. - Add the Baritone tweak class to line 7 "minecraftArguments" like so: `"minecraftArguments": " ... --tweakClass clientapi.load.ClientTweaker --tweakClass baritone.launch.BaritoneTweakerOptifine",`. You need the Optifine tweaker even though there is no Optifine involved, for reasons I don't quite understand. -- Add the Baritone library. Insert `{ "name": "cabaletta:baritone:1.0" },` between Impact and ClientAPI, which should be between lines 15 and 16. +- Add the Baritone library. Insert `{ "name": "cabaletta:baritone:1.0.0" },` between Impact and ClientAPI, which should be between lines 15 and 16. -Restart the Minecraft launcher, then load Impact 4.3 as normal, and it should now include Baritone. \ No newline at end of file +Restart the Minecraft launcher, then load Impact 4.3 as normal, and it should now include Baritone. From ba7dc46442039fc45d013629bf7b2fb1af95acff Mon Sep 17 00:00:00 2001 From: Brady Date: Mon, 3 Sep 2018 12:43:27 -0500 Subject: [PATCH 09/11] Another Impact install update --- IMPACT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IMPACT.md b/IMPACT.md index b57a0dfe..44a3fc0a 100644 --- a/IMPACT.md +++ b/IMPACT.md @@ -8,7 +8,7 @@ To build it yourself, clone and setup Baritone (instructions in main README.md). Copy the jar into place. It should be `build/libs/baritone-1.0.0.jar` in baritone. Copy it to your libraries in your Minecraft install. For example, on Mac I do `cp Documents/baritone/build/libs/baritone-1.0.0.jar Library/Application\ Support/minecraft/libraries/cabaletta/baritone/1.0.0/baritone-1.0.0.jar`. The first time you'll need to make the directory `cabaletta/baritone/1.0.0` in libraries first. -Then, we'll need to modify the Impact launch json. Open `minecraft/versions/1.12.2-Impact_4.3/1.12.2-Impact_4.3.json`. +Then, we'll need to modify the Impact launch json. Open `minecraft/versions/1.12.2-Impact_4.3/1.12.2-Impact_4.3.json` or copy your existing installation and rename the version folder, json, and id in the json. - Add the Baritone tweak class to line 7 "minecraftArguments" like so: `"minecraftArguments": " ... --tweakClass clientapi.load.ClientTweaker --tweakClass baritone.launch.BaritoneTweakerOptifine",`. You need the Optifine tweaker even though there is no Optifine involved, for reasons I don't quite understand. - Add the Baritone library. Insert `{ "name": "cabaletta:baritone:1.0.0" },` between Impact and ClientAPI, which should be between lines 15 and 16. From 53d9d3da5e4360fec52a7e625a39f2333a3aaa4f Mon Sep 17 00:00:00 2001 From: Brady Date: Mon, 3 Sep 2018 12:58:21 -0500 Subject: [PATCH 10/11] lol --- IMPACT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IMPACT.md b/IMPACT.md index 44a3fc0a..859a2423 100644 --- a/IMPACT.md +++ b/IMPACT.md @@ -2,7 +2,7 @@ Baritone will be in Impact 4.4 with nice integrations with its hacks, but if you're impatient you can run Baritone on top of Impact 4.3 right now. -You can either build Baritone yourself, or download the jar from Steptember 3 from here +You can either build Baritone yourself, or download the jar from September 3 from here To build it yourself, clone and setup Baritone (instructions in main README.md). Then, build the jar. From the command line, it's `./gradlew build` (or `gradlew build` on Windows). In IntelliJ, you can just start the `build` task in the Gradle menu. From 4690bcb5ac236f596131d28844fa2b4891ca24d9 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Mon, 3 Sep 2018 11:43:06 -0700 Subject: [PATCH 11/11] add example --- FEATURES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FEATURES.md b/FEATURES.md index 8147fc22..d75cca87 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -2,7 +2,7 @@ - **Long distance pathing and splicing** Baritone calculates paths in segments, and precalculates the next segment when the current one is about to end, so that it's moving towards the goal at all times. - **Chunk caching** Baritone simplifies chunks to a compacted internal 2-bit representation (AIR, SOLID, WATER, AVOID) and stores them in RAM for better very-long-distance pathing. There is also an option to save these cached chunks to disk. Example - **Block breaking** Baritone considers breaking blocks as part of its path. It also takes into account your current tool set and hot bar. For example, if you have a Eff V diamond pick, it may choose to mine through a stone barrier, while if you only had a wood pick it might be faster to climb over it. -- **Block placing** Baritone considers placing blocks as part of its path. This includes sneak-back-placing, pillaring, etc. It has a configurable penalty of placing a block (set to 1 second by default), to conserve its resources. The list of acceptable throwaway blocks is also configurable, and is cobble, dirt, or netherrack by default. +- **Block placing** Baritone considers placing blocks as part of its path. This includes sneak-back-placing, pillaring, etc. It has a configurable penalty of placing a block (set to 1 second by default), to conserve its resources. The list of acceptable throwaway blocks is also configurable, and is cobble, dirt, or netherrack by default. Example - **Falling** Baritone will fall up to 3 blocks onto solid ground (configurable, if you have Feather Falling and/or don't mind taking a little damage). If you have a water bucket on your hotbar, it will fall up to 23 blocks and place the bucket beneath it. It will fall an unlimited distance into existing still water. - **Vines and ladders** Baritone understands how to climb and descend vines and ladders. There is experimental support for more advanced maneuvers, like strafing to a different ladder / vine column in midair (off by default, setting named `allowVines`). - **Fence gates and doors**