/libraries/cabaletta/baritone/X.Y.Z/baritone-X.Y.Z.jar``
-
-## Modifying the Impact Profile JSON to run baritone
-The final step is "registering" the Baritone library with Impact, so that it loads on launch.
-- Ensure your Minecraft launcher is closed
-- Navigate back to the Minecraft Installation Directory
-- Find the ``versions`` directory, and open in
-- In here there should be a ``1.12.2-Impact_4.3`` folder.
- - If you don't have any Impact folder or have a version older than 4.3, you can download Impact here.
-- Open the folder and inside there should be a file called ``1.12.2-Impact_4.3.json``
-- Open the JSON file with a text editor that supports your system's line endings
- - For example, Notepad on Windows likely will NOT work for this. You should instead use a Text Editor like
- Notepad++ if you're on Windows. (For other systems, I'm not sure
- what would work the best so you may have to do some research.)
-- Find the ``libraries`` array in the JSON. It should look something like this.
- ```
- "libraries": [
- {
- "name": "net.minecraft:launchwrapper:1.12"
- },
- {
- "name": "com.github.ImpactDevelopment:Impact:4.3-1.12.2",
- "url": "https://impactdevelopment.github.io/maven/"
- },
- {
- "name": "com.github.ImpactDeveloment:ClientAPI:3.0.2",
- "url": "https://impactdevelopment.github.io/maven/"
- },
- ...
- ```
-- Create two new objects in the array, between the ``Impact`` and ``ClientAPI`` dependencies preferably.
- ```
- {
- "name": "cabaletta:baritone:X.Y.Z"
- },
- {
- "name": "com.github.ImpactDevelopment:SimpleTweaker:1.2",
- "url": "https://impactdevelopment.github.io/maven/"
- },
- ```
-- Now find the ``"minecraftArguments": "..."`` text near the top.
-- At the very end of the quotes where it says ``--tweakClass clientapi.load.ClientTweaker"``, add on the following so it looks like:
- - ``--tweakClass clientapi.load.ClientTweaker --tweakClass baritone.launch.BaritoneTweaker"``
-- If you didn't close your launcher for this step, restart it now.
-- You can now launch Impact 4.3 as normal, and Baritone should start up
-
- ## How to use Baritone
-
-- [Baritone chat control usage](USAGE.md)
diff --git a/LICENSE-Part-2.jpg b/LICENSE-Part-2.jpg
new file mode 100644
index 00000000..d087ee7e
Binary files /dev/null and b/LICENSE-Part-2.jpg differ
diff --git a/README.md b/README.md
index eb96e9e4..5aee5702 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Baritone
[](https://travis-ci.com/cabaletta/baritone)
[](https://github.com/cabaletta/baritone/releases)
-[](LICENSE)
+[](LICENSE)
[](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&utm_medium=referral&utm_content=cabaletta/baritone&utm_campaign=Badge_Grade)
[](http://hits.dwyl.com/cabaletta/baritone)
[](https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle)
@@ -34,23 +34,27 @@ Have committed at least once a day for the last 6 months =D 🦀
1Leijurv3DWTrGAfmmiTphjhXLvQiHg7K2
+# Getting Started
+
Here are some links to help to get started:
- [Features](FEATURES.md)
-- [Setup](SETUP.md)
+- [Installation & setup](SETUP.md)
-- [Installation](INSTALL.md)
+- [API Javadocs](https://baritone.leijurv.com/)
-- [Javadocs](https://baritone.leijurv.com/)
-
-- [Settings](https://baritone.leijurv.com/baritone/api/Settings.html#allowBreak)
-
-# Chat control
+- [Settings](https://baritone.leijurv.com/baritone/api/Settings.html#field.detail)
- [Baritone chat control usage](USAGE.md)
-# API example
+# API
+
+The API is heavily documented, you can find the Javadocs for the latest release [here](https://baritone.leijurv.com/).
+Please note that usage of anything located outside of the ``baritone.api`` package is not supported by the API release
+jar.
+
+Below is an example of basic usage for changing some settings, and then pathing to a X/Z goal.
```
BaritoneAPI.getSettings().allowSprint.value = true;
diff --git a/SETUP.md b/SETUP.md
index 6d50a85b..cd19a574 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -1,20 +1,23 @@
-# Setup
+# Installation
-## Prebuilt
-(not always completely up to date with latest features)
+## Prebuilt official releases
+These releases are not always completely up to date with latest features, and are only released from `master`. (so if you want `builder` branch for example, you'll have to build it yourself)
-Download from the [Releases](https://github.com/cabaletta/baritone/releases)
+Link to the releases page: [Releases](https://github.com/cabaletta/baritone/releases)
-The Forge releases can simply be added as a Forge mod.
+Any official release will be GPG signed by leijurv (44A3EA646EADAC6A) and ZeroMemes (73A788379A197567). Please verify that the hash of the file you download is in `checksums.txt` and that `checksums_signed.asc` is a valid signature by those two public keys of `checksums.txt`.
-If another one of your Forge mods has a Baritone integration, you want `baritone-api-forge-VERSION.jar`. Otherwise, you want `baritone-standalone-forge-VERSION.jar`
+The build is fully deterministic and reproducible, and you can verify Travis did it properly by running `docker build --no-cache -t cabaletta/baritone .` yourself and comparing the shasum. This works identically on Travis, Mac, and Linux (if you have docker on Windows, I'd be grateful if you could let me know if it works there too).
-Previously (Baritone v1.1.2 and below), it was not fully compatible with the latest version of Forge. `freeLook` was broken in Forge 14.23.4.2744. Forge 14.23.4.2743 or **older** worked with Baritone v1.1.2 and lower. Newer versions of Forge "worked", sort of, but Baritone's movement became unreliable and `freeLook` must be off.
## Artifacts
Building Baritone will result in 5 artifacts created in the ``dist`` directory. These are the same as the artifacts created in the [releases](https://github.com/cabaletta/baritone/releases).
+**The Forge release can simply be added as a Forge mod.**
+
+If another one of your Forge mods has a Baritone integration, you want `baritone-api-forge-VERSION.jar`. Otherwise, you want `baritone-standalone-forge-VERSION.jar`
+
- **API**: Only the non-api packages are obfuscated. This should be used in environments where other mods would like to use Baritone's features.
- **Forge API**: Same as API, but packaged for Forge. This should be used where another mod has a Baritone integration.
- **Standalone**: Everything is obfuscated. This should be used in environments where there are no other mods present that would like to use Baritone's features.
@@ -22,9 +25,9 @@ Building Baritone will result in 5 artifacts created in the ``dist`` directory.
- **Unoptimized**: Nothing is obfuscated. This shouldn't be used ever in production.
## More Info
-To replace out Impact 4.4's Baritone build with a customized one, switch to the `impact4.4-compat` branch, build Baritone as above then copy `dist/baritone-api-$VERSION$.jar` into `minecraft/libraries/cabaletta/baritone-api/1.0.0/baritone-api-1.0.0.jar`, replacing the jar that was previously there. You also need to edit `minecraft/versions/1.12.2-Impact_4.4/1.12.2-Impact_4.4.json`, find the line `"name": "cabaletta:baritone-api:1.0.0"`, remove the comma from the end, and entirely remove the line that's immediately after (starts with `"url"`).
+To replace out Impact 4.5's Baritone build with a customized one, build Baritone as above then copy `dist/baritone-api-$VERSION$.jar` into `minecraft/libraries/cabaletta/baritone-api/1.2/baritone-api-1.2.jar`, replacing the jar that was previously there. You also need to edit `minecraft/versions/1.12.2-Impact_4.5/1.12.2-Impact_4.5.json`, find the line `"name": "cabaletta:baritone-api:1.2"`, remove the comma from the end, and **entirely remove the next line** (starts with `"url"`).
-Impact 4.4 **only** works with builds from the quite outdated `impact4.4-compat` branch. If you must have the latest Baritone features with Impact, and can't wait for 4.5, consider creating a standalone (non forge) build then adding it to Impact 4.**3** via the instructions in [Install](INSTALL.md).
+You can verify whether or not it worked by running `.b version` in chat (only valid in Impact). It should print out the version that you downloaded. Note: The version that comes with 4.5 is `v1.2.3`.
## Build it yourself
- Clone or download Baritone
diff --git a/USAGE.md b/USAGE.md
index 391e5e45..6a07518b 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -9,7 +9,7 @@ Therefore you can use a prefix before your messages.
On Baritone v1.1.0 and newer: The prefix is `#` by default. Anything beginning with `#` isn't sent, and is only interpreted by Baritone.
For older than v1.1.0, `#` must be enabled by toggling on the `prefix` setting.
-**Only** in Impact 4.4 is `.b` also a valid prefix. In 4.4, `#` does **not** work, neither does saying the commands directly in chat.
+**Only** in Impact is `.b` also a valid prefix. In 4.4, `#` does **not** work, neither does saying the commands directly in chat. `#` works by default in 4.5 (not 4.4).
Other clients like Kami and Asuna have their own custom things (like `-path`), and can disable direct chat control entirely.
@@ -21,7 +21,7 @@ Other clients like Kami and Asuna have their own custom things (like `-path`), a
`help` for (rudimentary) help. You can see what it says [here](https://github.com/cabaletta/baritone/blob/master/src/main/java/baritone/utils/ExampleBaritoneControl.java#L53).
-To toggle a boolean setting, just say its name in chat (for example saying `allowBreak` toggles whether Baritone will consider breaking blocks). For a numeric setting, say its name then the new value (like `primaryTimeoutMS 250`). It's case insensitive.
+To toggle a boolean setting, just say its name in chat (for example saying `allowBreak` toggles whether Baritone will consider breaking blocks). For a numeric setting, say its name then the new value (like `primaryTimeoutMS 250`). It's case insensitive. To reset a setting to its default value, say `acceptableThrowawayItems reset`. To reset all settings, say `reset`. To see all settings that have been modified from their default values, say `modified`.
@@ -39,11 +39,12 @@ Some common examples:
- `axis` to go to an axis or diagonal axis at y=120 (`axisHeight` is a configurable setting, defaults to 120).
- `invert` to invert the current goal and path. This gets as far away from it as possible, instead of as close as possible. For example, do `goal` then `invert` to run as far as possible from where you're standing at the start.
- `render` to rerender the world in case `renderCachedChunks` is being glitchy
+- `version` to get the version of Baritone you're running
- `damn` daniel
For the rest of the commands, you can take a look at the code [here](https://github.com/cabaletta/baritone/blob/master/src/main/java/baritone/utils/ExampleBaritoneControl.java).
-All the settings and documentation are here. If you find HTML easier to read than Javadoc, you can look here.
+All the settings and documentation are here. If you find HTML easier to read than Javadoc, you can look here.
There are about a hundred settings, but here are some fun / interesting / important ones that you might want to look at changing in normal usage of Baritone. The documentation for each can be found at the above links.
- `allowBreak`
diff --git a/build.gradle b/build.gradle
index 996a8e0f..e52cc370 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,134 +1,132 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone. If not, see .
- */
-
-group 'baritone'
-version '1.1.6'
-
-buildscript {
- repositories {
- maven {
- name = 'forge'
- url = 'http://files.minecraftforge.net/maven'
- }
- maven {
- name = 'SpongePowered'
- url = 'http://repo.spongepowered.org/maven'
- }
- jcenter()
- }
-
- dependencies {
- classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
- classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
- }
-}
-
-
-import baritone.gradle.task.CreateDistTask
-import baritone.gradle.task.ProguardTask
-
-apply plugin: 'java'
-apply plugin: 'net.minecraftforge.gradle.tweaker-client'
-apply plugin: 'org.spongepowered.mixin'
-
-sourceCompatibility = targetCompatibility = '1.8'
-compileJava {
- sourceCompatibility = targetCompatibility = '1.8'
- options.encoding = "UTF-8" // allow emoji in comments :^)
-}
-
-sourceSets {
- launch {
- compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
- }
-}
-
-minecraft {
- version = '1.12.2'
- mappings = 'stable_39'
- tweakClass = 'baritone.launch.BaritoneTweaker'
- runDir = 'run'
-
- // The sources jar should use SRG names not MCP to ensure compatibility with all mappings
- makeObfSourceJar = true
-}
-
-repositories {
- mavenCentral()
-
- maven {
- name = 'spongepowered-repo'
- url = 'http://repo.spongepowered.org/maven/'
- }
-
- maven {
- name = 'impactdevelopment-repo'
- url = 'https://impactdevelopment.github.io/maven/'
- }
-}
-
-dependencies {
- runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
- runtime launchCompile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
- // Mixin includes a lot of dependencies that are too up-to-date
- exclude module: 'launchwrapper'
- exclude module: 'guava'
- exclude module: 'gson'
- exclude module: 'commons-io'
- exclude module: 'log4j-core'
- }
- testImplementation 'junit:junit:4.12'
-}
-
-mixin {
- defaultObfuscationEnv searge
- add sourceSets.launch, 'mixins.baritone.refmap.json'
-}
-
-javadoc {
- options.addStringOption('Xwerror', '-quiet') // makes the build fail on travis when there is a javadoc error
- options.linkSource true
- options.encoding "UTF-8" // allow emoji in comments :^)
- source += sourceSets.api.allJava
- classpath += sourceSets.api.compileClasspath
-}
-
-jar {
- from sourceSets.launch.output, sourceSets.api.output
- preserveFileTimestamps = false
- reproducibleFileOrder = true
-}
-
-jar {
- manifest {
- attributes(
- 'MixinConfigs': 'mixins.baritone.json',
-
- 'Implementation-Title': 'Baritone',
- 'Implementation-Version': version
- )
- }
-}
-
-task proguard(type: ProguardTask) {
- url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
- extract 'proguard6.0.3/lib/proguard.jar'
-}
-
-task createDist(type: CreateDistTask, dependsOn: proguard)
-
-build.finalizedBy(createDist)
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone. If not, see .
+ */
+
+group 'baritone'
+version '1.2.3'
+
+buildscript {
+ repositories {
+ maven {
+ name = 'forge'
+ url = 'http://files.minecraftforge.net/maven'
+ }
+ maven {
+ name = 'SpongePowered'
+ url = 'http://repo.spongepowered.org/maven'
+ }
+ jcenter()
+ }
+
+ dependencies {
+ classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+ classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
+ }
+}
+
+
+import baritone.gradle.task.CreateDistTask
+import baritone.gradle.task.ProguardTask
+
+apply plugin: 'java'
+apply plugin: 'net.minecraftforge.gradle.tweaker-client'
+apply plugin: 'org.spongepowered.mixin'
+
+sourceCompatibility = targetCompatibility = '1.8'
+compileJava {
+ sourceCompatibility = targetCompatibility = '1.8'
+ options.encoding = "UTF-8" // allow emoji in comments :^)
+}
+
+sourceSets {
+ launch {
+ compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
+ }
+}
+
+minecraft {
+ version = '1.12.2'
+ mappings = 'stable_39'
+ tweakClass = 'baritone.launch.BaritoneTweaker'
+ runDir = 'run'
+
+ // The sources jar should use SRG names not MCP to ensure compatibility with all mappings
+ makeObfSourceJar = true
+}
+
+repositories {
+ mavenCentral()
+
+ maven {
+ name = 'spongepowered-repo'
+ url = 'http://repo.spongepowered.org/maven/'
+ }
+
+ maven {
+ name = 'impactdevelopment-repo'
+ url = 'https://impactdevelopment.github.io/maven/'
+ }
+}
+
+dependencies {
+ runtime launchCompile('com.github.ImpactDevelopment:SimpleTweaker:1.2')
+ runtime launchCompile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
+ // Mixin includes a lot of dependencies that are too up-to-date
+ exclude module: 'launchwrapper'
+ exclude module: 'guava'
+ exclude module: 'gson'
+ exclude module: 'commons-io'
+ exclude module: 'log4j-core'
+ }
+ testImplementation 'junit:junit:4.12'
+}
+
+mixin {
+ defaultObfuscationEnv searge
+ add sourceSets.launch, 'mixins.baritone.refmap.json'
+}
+
+javadoc {
+ options.addStringOption('Xwerror', '-quiet') // makes the build fail on travis when there is a javadoc error
+ options.linkSource true
+ options.encoding "UTF-8" // allow emoji in comments :^)
+ source = sourceSets.api.allJava
+ classpath += sourceSets.api.compileClasspath
+}
+
+jar {
+ from sourceSets.launch.output, sourceSets.api.output
+ preserveFileTimestamps = false
+ reproducibleFileOrder = true
+
+ manifest {
+ attributes(
+ 'MixinConfigs': 'mixins.baritone.json',
+
+ 'Implementation-Title': 'Baritone',
+ 'Implementation-Version': version
+ )
+ }
+}
+
+task proguard(type: ProguardTask) {
+ url 'https://downloads.sourceforge.net/project/proguard/proguard/6.0/proguard6.0.3.zip'
+ extract 'proguard6.0.3/lib/proguard.jar'
+}
+
+task createDist(type: CreateDistTask, dependsOn: proguard)
+
+build.finalizedBy(createDist)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 59006a9e..599a02b7 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jul 31 21:56:56 PDT 2018
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+#Tue Jul 31 21:56:56 PDT 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6..f9553162 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,84 +1,84 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/scripts/proguard.pro b/scripts/proguard.pro
index e4189f7f..4bed6b5d 100644
--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -13,8 +13,7 @@
-repackageclasses 'baritone'
# lwjgl is weird
--dontwarn org.lwjgl.opengl.GL14
--dontwarn org.lwjgl.opengl.GL11
+-dontwarn org.lwjgl.**
-keep class baritone.api.** { *; } # this is the keep api
diff --git a/settings.gradle b/settings.gradle
index baa9dfc9..567f8411 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,19 +1,19 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone. If not, see .
- */
-
-rootProject.name = 'baritone'
-
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone. If not, see .
+ */
+
+rootProject.name = 'baritone'
+
diff --git a/src/api/java/baritone/api/BaritoneAPI.java b/src/api/java/baritone/api/BaritoneAPI.java
index c1227830..4ea6ef3e 100644
--- a/src/api/java/baritone/api/BaritoneAPI.java
+++ b/src/api/java/baritone/api/BaritoneAPI.java
@@ -23,9 +23,7 @@ import java.util.Iterator;
import java.util.ServiceLoader;
/**
- * API exposure for various things implemented in Baritone.
- *
- * W.I.P
+ * Exposes the {@link IBaritoneProvider} instance and the {@link Settings} instance for API usage.
*
* @author Brady
* @since 9/23/2018
diff --git a/src/api/java/baritone/api/IBaritone.java b/src/api/java/baritone/api/IBaritone.java
index 538dd0c7..a12b206d 100644
--- a/src/api/java/baritone/api/IBaritone.java
+++ b/src/api/java/baritone/api/IBaritone.java
@@ -33,10 +33,19 @@ import baritone.api.utils.IPlayerContext;
public interface IBaritone {
/**
- * @return The {@link IFollowProcess} instance
- * @see IFollowProcess
+ * Call as soon as Minecraft is ready, initializes all of the processes, behaviors, etc. This will
+ * only effectively be ran once, any additional calls are redundant because the initialization state
+ * is saved.
+ *
+ * Or whenever your overeager utility client wants.
*/
- IFollowProcess getFollowProcess();
+ void init();
+
+ /**
+ * @return The {@link IPathingBehavior} instance
+ * @see IPathingBehavior
+ */
+ IPathingBehavior getPathingBehavior();
/**
* @return The {@link ILookBehavior} instance
@@ -44,6 +53,12 @@ public interface IBaritone {
*/
ILookBehavior getLookBehavior();
+ /**
+ * @return The {@link IFollowProcess} instance
+ * @see IFollowProcess
+ */
+ IFollowProcess getFollowProcess();
+
/**
* @return The {@link IMineProcess} instance
* @see IMineProcess
@@ -57,10 +72,16 @@ public interface IBaritone {
IBuilderProcess getBuilderProcess();
/**
- * @return The {@link IPathingBehavior} instance
- * @see IPathingBehavior
+ * @return The {@link ICustomGoalProcess} instance
+ * @see ICustomGoalProcess
*/
- IPathingBehavior getPathingBehavior();
+ ICustomGoalProcess getCustomGoalProcess();
+
+ /**
+ * @return The {@link IGetToBlockProcess} instance
+ * @see IGetToBlockProcess
+ */
+ IGetToBlockProcess getGetToBlockProcess();
/**
* @return The {@link IWorldProvider} instance
@@ -68,22 +89,30 @@ public interface IBaritone {
*/
IWorldProvider getWorldProvider();
+ /**
+ * Returns the {@link IPathingControlManager} for this {@link IBaritone} instance, which is responsible
+ * for managing the {@link IBaritoneProcess}es which control the {@link IPathingBehavior} state.
+ *
+ * @return The {@link IPathingControlManager} instance
+ * @see IPathingControlManager
+ */
IPathingControlManager getPathingControlManager();
+ /**
+ * @return The {@link IInputOverrideHandler} instance
+ * @see IInputOverrideHandler
+ */
IInputOverrideHandler getInputOverrideHandler();
- ICustomGoalProcess getCustomGoalProcess();
-
- IGetToBlockProcess getGetToBlockProcess();
-
+ /**
+ * @return The {@link IPlayerContext} instance
+ * @see IPlayerContext
+ */
IPlayerContext getPlayerContext();
- IEventBus getGameEventHandler();
-
/**
- * Call as soon as Minecraft is ready.
- *
- * Or whenever your overeager utility client wants.
+ * @return The {@link IEventBus} instance
+ * @see IEventBus
*/
- void init();
+ IEventBus getGameEventHandler();
}
diff --git a/src/api/java/baritone/api/IBaritoneProvider.java b/src/api/java/baritone/api/IBaritoneProvider.java
index d17e8e00..bdefb66f 100644
--- a/src/api/java/baritone/api/IBaritoneProvider.java
+++ b/src/api/java/baritone/api/IBaritoneProvider.java
@@ -23,7 +23,9 @@ import net.minecraft.client.entity.EntityPlayerSP;
import java.util.List;
/**
- * @author Leijurv
+ * Provides the present {@link IBaritone} instances
+ *
+ * @author leijurv
*/
public interface IBaritoneProvider {
@@ -47,7 +49,8 @@ public interface IBaritoneProvider {
/**
* Provides the {@link IBaritone} instance for a given {@link EntityPlayerSP}. This will likely be
- * replaced with {@code #getBaritoneForUser(IBaritoneUser)} when {@code bot-system} is merged.
+ * replaced with or be overloaded in addition to {@code #getBaritoneForUser(IBaritoneUser)} when
+ * {@code bot-system} is merged into {@code master}.
*
* @param player The player
* @return The {@link IBaritone} instance.
@@ -58,7 +61,7 @@ public interface IBaritoneProvider {
return baritone;
}
}
- throw new IllegalStateException("No baritone for player " + player);
+ return null;
}
/**
diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java
index 2878e4d6..7b47a2a6 100644
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -17,6 +17,7 @@
package baritone.api;
+import baritone.api.utils.SettingsUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
@@ -29,7 +30,7 @@ import java.util.List;
import java.util.function.Consumer;
/**
- * Baritone's settings
+ * Baritone's settings. Settings apply to all Baritone instances.
*
* @author leijurv
*/
@@ -169,6 +170,11 @@ public final class Settings {
*/
public final Setting sprintAscends = new Setting<>(true);
+ /**
+ * How many ticks between right clicks are allowed. Default in game is 4
+ */
+ public final Setting rightClickSpeed = new Setting<>(4);
+
/**
* This is the big A* setting.
* As long as your cost heuristic is an *underestimate*, it's guaranteed to find you the best path.
@@ -385,11 +391,6 @@ public final class Settings {
*/
public final Setting pruneRegionsFromRAM = new Setting<>(false);
- /**
- * Cancel baritone on left click, as a form of "panic button"
- */
- public final Setting clickCancel = new Setting<>(false);
-
/**
* Remember the contents of containers (chests, echests, furnaces)
*
@@ -508,11 +509,6 @@ public final class Settings {
*/
public final Setting cachedChunksOpacity = new Setting<>(0.5f);
- /**
- * If true, Baritone will not allow you to left or right click while pathing
- */
- public final Setting suppressClicks = new Setting<>(false);
-
/**
* Whether or not to use the "#" command prefix
*/
@@ -704,12 +700,6 @@ public final class Settings {
*/
public final List> allSettings;
- public void reset() {
- for (Setting setting : allSettings) {
- setting.value = setting.defaultValue;
- }
- }
-
public final class Setting {
public T value;
public final T defaultValue;
@@ -739,8 +729,13 @@ public final class Settings {
return klass;
}
+ @Override
public String toString() {
- return name + ": " + value;
+ return SettingsUtil.settingToString(this);
+ }
+
+ public void reset() {
+ value = defaultValue;
}
}
diff --git a/src/api/java/baritone/api/behavior/IBehavior.java b/src/api/java/baritone/api/behavior/IBehavior.java
index 248148e7..fbef5258 100644
--- a/src/api/java/baritone/api/behavior/IBehavior.java
+++ b/src/api/java/baritone/api/behavior/IBehavior.java
@@ -18,8 +18,13 @@
package baritone.api.behavior;
import baritone.api.event.listener.AbstractGameEventListener;
+import baritone.api.event.listener.IGameEventListener;
/**
+ * A behavior is simply a type that is able to listen to events.
+ *
+ * @see IGameEventListener
+ *
* @author Brady
* @since 9/23/2018
*/
diff --git a/src/api/java/baritone/api/utils/IInputOverrideHandler.java b/src/api/java/baritone/api/utils/IInputOverrideHandler.java
index 03f6e4dd..3cfb7438 100644
--- a/src/api/java/baritone/api/utils/IInputOverrideHandler.java
+++ b/src/api/java/baritone/api/utils/IInputOverrideHandler.java
@@ -19,7 +19,6 @@ package baritone.api.utils;
import baritone.api.behavior.IBehavior;
import baritone.api.utils.input.Input;
-import net.minecraft.client.settings.KeyBinding;
/**
* @author Brady
@@ -27,8 +26,6 @@ import net.minecraft.client.settings.KeyBinding;
*/
public interface IInputOverrideHandler extends IBehavior {
- Boolean isInputForcedDown(KeyBinding key);
-
boolean isInputForcedDown(Input input);
void setInputForceState(Input input, boolean forced);
diff --git a/src/api/java/baritone/api/utils/IPlayerController.java b/src/api/java/baritone/api/utils/IPlayerController.java
index dd63a41b..dced5286 100644
--- a/src/api/java/baritone/api/utils/IPlayerController.java
+++ b/src/api/java/baritone/api/utils/IPlayerController.java
@@ -17,12 +17,17 @@
package baritone.api.utils;
+import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ClickType;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
import net.minecraft.world.GameType;
+import net.minecraft.world.World;
/**
* @author Brady
@@ -43,4 +48,6 @@ public interface IPlayerController {
default double getBlockReachDistance() {
return this.getGameType().isCreative() ? 5.0F : 4.5F;
}
+
+ EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand);
}
diff --git a/src/api/java/baritone/api/utils/SettingsUtil.java b/src/api/java/baritone/api/utils/SettingsUtil.java
index 07b4cd98..84e9af68 100644
--- a/src/api/java/baritone/api/utils/SettingsUtil.java
+++ b/src/api/java/baritone/api/utils/SettingsUtil.java
@@ -27,10 +27,8 @@ import java.io.BufferedWriter;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.regex.Matcher;
@@ -89,22 +87,8 @@ public class SettingsUtil {
public static synchronized void save(Settings settings) {
try (BufferedWriter out = Files.newBufferedWriter(SETTINGS_PATH)) {
- for (Settings.Setting setting : settings.allSettings) {
- if (setting.get() == null) {
- System.out.println("NULL SETTING?" + setting.getName());
- continue;
- }
- if (setting.getName().equals("logger")) {
- continue; // NO
- }
- if (setting.value == setting.defaultValue) {
- continue;
- }
- SettingsIO io = map.get(setting.getValueClass());
- if (io == null) {
- throw new IllegalStateException("Missing " + setting.getValueClass() + " " + setting + " " + setting.getName());
- }
- out.write(setting.getName() + " " + io.toString.apply(setting.get()) + "\n");
+ for (Settings.Setting setting : modifiedSettings(settings)) {
+ out.write(settingToString(setting) + "\n");
}
} catch (Exception ex) {
System.out.println("Exception thrown while saving Baritone settings!");
@@ -112,7 +96,36 @@ public class SettingsUtil {
}
}
- private static void parseAndApply(Settings settings, String settingName, String settingValue) throws IllegalStateException, NumberFormatException {
+ public static List modifiedSettings(Settings settings) {
+ List modified = new ArrayList<>();
+ for (Settings.Setting setting : settings.allSettings) {
+ if (setting.get() == null) {
+ System.out.println("NULL SETTING?" + setting.getName());
+ continue;
+ }
+ if (setting.getName().equals("logger")) {
+ continue; // NO
+ }
+ if (setting.value == setting.defaultValue) {
+ continue;
+ }
+ modified.add(setting);
+ }
+ return modified;
+ }
+
+ public static String settingToString(Settings.Setting setting) throws IllegalStateException {
+ if (setting.getName().equals("logger")) {
+ return "logger";
+ }
+ SettingsIO io = map.get(setting.getValueClass());
+ if (io == null) {
+ throw new IllegalStateException("Missing " + setting.getValueClass() + " " + setting.getName());
+ }
+ return setting.getName() + " " + io.toString.apply(setting.get());
+ }
+
+ public static void parseAndApply(Settings settings, String settingName, String settingValue) throws IllegalStateException, NumberFormatException {
Settings.Setting setting = settings.byLowerName.get(settingName);
if (setting == null) {
throw new IllegalStateException("No setting by that name");
diff --git a/src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java b/src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java
index 460d8a27..0fd2436c 100644
--- a/src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java
+++ b/src/launch/java/baritone/launch/mixins/MixinEntityLivingBase.java
@@ -18,6 +18,7 @@
package baritone.launch.mixins;
import baritone.api.BaritoneAPI;
+import baritone.api.IBaritone;
import baritone.api.event.events.RotationMoveEvent;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.entity.Entity;
@@ -55,8 +56,11 @@ public abstract class MixinEntityLivingBase extends Entity {
private void preMoveRelative(CallbackInfo ci) {
// noinspection ConstantConditions
if (EntityPlayerSP.class.isInstance(this)) {
- this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.rotationYaw);
- BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerRotationMove(this.jumpRotationEvent);
+ IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+ if (baritone != null) {
+ this.jumpRotationEvent = new RotationMoveEvent(RotationMoveEvent.Type.JUMP, this.rotationYaw);
+ baritone.getGameEventHandler().onPlayerRotationMove(this.jumpRotationEvent);
+ }
}
}
@@ -69,7 +73,7 @@ public abstract class MixinEntityLivingBase extends Entity {
)
)
private float overrideYaw(EntityLivingBase self) {
- if (self instanceof EntityPlayerSP) {
+ if (self instanceof EntityPlayerSP && BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this) != null) {
return this.jumpRotationEvent.getYaw();
}
return self.rotationYaw;
@@ -84,7 +88,7 @@ public abstract class MixinEntityLivingBase extends Entity {
)
private void travel(EntityLivingBase self, float strafe, float up, float forward, float friction) {
// noinspection ConstantConditions
- if (!EntityPlayerSP.class.isInstance(this)) {
+ if (!EntityPlayerSP.class.isInstance(this) || BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this) == null) {
moveRelative(strafe, up, forward, friction);
return;
}
diff --git a/src/launch/java/baritone/launch/mixins/MixinEntityPlayerSP.java b/src/launch/java/baritone/launch/mixins/MixinEntityPlayerSP.java
index 87cc6562..7c1225b9 100644
--- a/src/launch/java/baritone/launch/mixins/MixinEntityPlayerSP.java
+++ b/src/launch/java/baritone/launch/mixins/MixinEntityPlayerSP.java
@@ -19,7 +19,6 @@ package baritone.launch.mixins;
import baritone.api.BaritoneAPI;
import baritone.api.IBaritone;
-import baritone.api.behavior.IPathingBehavior;
import baritone.api.event.events.ChatEvent;
import baritone.api.event.events.PlayerUpdateEvent;
import baritone.api.event.events.SprintStateEvent;
@@ -48,7 +47,11 @@ public class MixinEntityPlayerSP {
)
private void sendChatMessage(String msg, CallbackInfo ci) {
ChatEvent event = new ChatEvent(msg);
- BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onSendChatMessage(event);
+ IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+ if (baritone == null) {
+ return;
+ }
+ baritone.getGameEventHandler().onSendChatMessage(event);
if (event.isCancelled()) {
ci.cancel();
}
@@ -64,7 +67,10 @@ public class MixinEntityPlayerSP {
)
)
private void onPreUpdate(CallbackInfo ci) {
- BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
+ IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+ if (baritone != null) {
+ baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.PRE));
+ }
}
@Inject(
@@ -77,7 +83,10 @@ public class MixinEntityPlayerSP {
)
)
private void onPostUpdate(CallbackInfo ci) {
- BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
+ IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+ if (baritone != null) {
+ baritone.getGameEventHandler().onPlayerUpdate(new PlayerUpdateEvent(EventState.POST));
+ }
}
@Redirect(
@@ -88,8 +97,11 @@ public class MixinEntityPlayerSP {
)
)
private boolean isAllowFlying(PlayerCapabilities capabilities) {
- IPathingBehavior pathingBehavior = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getPathingBehavior();
- return !pathingBehavior.isPathing() && capabilities.allowFlying;
+ IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+ if (baritone == null) {
+ return capabilities.allowFlying;
+ }
+ return !baritone.getPathingBehavior().isPathing() && capabilities.allowFlying;
}
@Redirect(
@@ -100,8 +112,11 @@ public class MixinEntityPlayerSP {
)
)
private boolean isKeyDown(KeyBinding keyBinding) {
- SprintStateEvent event = new SprintStateEvent();
IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+ if (baritone == null) {
+ return keyBinding.isKeyDown();
+ }
+ SprintStateEvent event = new SprintStateEvent();
baritone.getGameEventHandler().onPlayerSprintState(event);
if (event.getState() != null) {
return event.getState();
@@ -120,6 +135,9 @@ public class MixinEntityPlayerSP {
)
)
private void updateRidden(CallbackInfo cb) {
- ((LookBehavior) BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this).getLookBehavior()).pig();
+ IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer((EntityPlayerSP) (Object) this);
+ if (baritone != null) {
+ ((LookBehavior) baritone.getLookBehavior()).pig();
+ }
}
}
diff --git a/src/launch/java/baritone/launch/mixins/MixinKeyBinding.java b/src/launch/java/baritone/launch/mixins/MixinKeyBinding.java
deleted file mode 100644
index d61537c9..00000000
--- a/src/launch/java/baritone/launch/mixins/MixinKeyBinding.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone. If not, see .
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import baritone.api.BaritoneAPI;
-import baritone.utils.Helper;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.KeyBinding;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-/**
- * @author Brady
- * @since 7/31/2018
- */
-@Mixin(KeyBinding.class)
-public class MixinKeyBinding {
-
- @Shadow
- private int pressTime;
-
- @Inject(
- method = "isKeyDown",
- at = @At("HEAD"),
- cancellable = true
- )
- private void isKeyDown(CallbackInfoReturnable cir) {
- // only the primary baritone forces keys
- Boolean force = BaritoneAPI.getProvider().getPrimaryBaritone().getInputOverrideHandler().isInputForcedDown((KeyBinding) (Object) this);
- if (force != null) {
- if (!force && !Baritone.settings().suppressClicks.get()) {
- return;
- }
- cir.setReturnValue(force); // :sunglasses:
- }
- }
-
- @Inject(
- method = "isPressed",
- at = @At("HEAD"),
- cancellable = true
- )
- private void isPressed(CallbackInfoReturnable cir) {
- // only the primary baritone forces keys
- Boolean force = BaritoneAPI.getProvider().getPrimaryBaritone().getInputOverrideHandler().isInputForcedDown((KeyBinding) (Object) this);
- if (pressTime > 0 && (KeyBinding) (Object) this == Minecraft.getMinecraft().gameSettings.keyBindAttack && Baritone.settings().clickCancel.get() && BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing()) {
- Helper.HELPER.logDirect("Cancelling path on left click since the clickCancel setting is enabled!");
- BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().cancelEverything();
- return;
- }
- if (force != null && !force && Baritone.settings().suppressClicks.get()) { // <-- cursed
- if (pressTime > 0) {
- Helper.HELPER.logDirect("You're trying to press this mouse button but I won't let you.");
- Helper.HELPER.logDirect("Turn off the suppressClicks setting to allow clicking while pathing.");
- pressTime--;
- }
- cir.setReturnValue(force); // :sunglasses:
- }
- }
-}
diff --git a/src/launch/resources/mixins.baritone.json b/src/launch/resources/mixins.baritone.json
index fea9cca7..3b5fa70c 100644
--- a/src/launch/resources/mixins.baritone.json
+++ b/src/launch/resources/mixins.baritone.json
@@ -17,7 +17,6 @@
"MixinEntityLivingBase",
"MixinEntityPlayerSP",
"MixinEntityRenderer",
- "MixinKeyBinding",
"MixinMinecraft",
"MixinNetHandlerPlayClient",
"MixinNetworkManager",
diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java
index 159abaf1..bf648807 100755
--- a/src/main/java/baritone/Baritone.java
+++ b/src/main/java/baritone/Baritone.java
@@ -1,220 +1,220 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone. If not, see .
- */
-
-package baritone;
-
-import baritone.api.BaritoneAPI;
-import baritone.api.IBaritone;
-import baritone.api.Settings;
-import baritone.api.event.listener.IEventBus;
-import baritone.api.utils.IPlayerContext;
-import baritone.behavior.*;
-import baritone.cache.WorldProvider;
-import baritone.event.GameEventHandler;
-import baritone.process.*;
-import baritone.utils.*;
-import baritone.utils.player.PrimaryPlayerContext;
-import net.minecraft.client.Minecraft;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author Brady
- * @since 7/31/2018
- */
-public class Baritone implements IBaritone {
-
- private static ThreadPoolExecutor threadPool;
- private static File dir;
-
- static {
- threadPool = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>());
-
- dir = new File(Minecraft.getMinecraft().gameDir, "baritone");
- if (!Files.exists(dir.toPath())) {
- try {
- Files.createDirectories(dir.toPath());
- } catch (IOException ignored) {}
- }
- }
-
- /**
- * Whether or not {@link Baritone#init()} has been called yet
- */
- private boolean initialized;
-
- private GameEventHandler gameEventHandler;
-
- private List behaviors;
- private PathingBehavior pathingBehavior;
- private LookBehavior lookBehavior;
- private MemoryBehavior memoryBehavior;
- private InventoryBehavior inventoryBehavior;
- private InputOverrideHandler inputOverrideHandler;
-
- private FollowProcess followProcess;
- private MineProcess mineProcess;
- private GetToBlockProcess getToBlockProcess;
- private CustomGoalProcess customGoalProcess;
- private BuilderProcess builderProcess;
-
- private PathingControlManager pathingControlManager;
-
- private IPlayerContext playerContext;
- private WorldProvider worldProvider;
-
- public BlockStateInterface bsi;
-
- Baritone() {
- this.gameEventHandler = new GameEventHandler(this);
- }
-
- @Override
- public synchronized void init() {
- if (initialized) {
- return;
- }
-
- // Define this before behaviors try and get it, or else it will be null and the builds will fail!
- this.playerContext = PrimaryPlayerContext.INSTANCE;
-
- this.behaviors = new ArrayList<>();
- {
- // the Behavior constructor calls baritone.registerBehavior(this) so this populates the behaviors arraylist
- pathingBehavior = new PathingBehavior(this);
- lookBehavior = new LookBehavior(this);
- memoryBehavior = new MemoryBehavior(this);
- inventoryBehavior = new InventoryBehavior(this);
- inputOverrideHandler = new InputOverrideHandler(this);
- new ExampleBaritoneControl(this);
- }
-
- this.pathingControlManager = new PathingControlManager(this);
- {
- followProcess = new FollowProcess(this);
- mineProcess = new MineProcess(this);
- customGoalProcess = new CustomGoalProcess(this); // very high iq
- getToBlockProcess = new GetToBlockProcess(this);
- builderProcess = new BuilderProcess(this);
- }
-
- this.worldProvider = new WorldProvider();
-
- if (BaritoneAutoTest.ENABLE_AUTO_TEST) {
- this.gameEventHandler.registerEventListener(BaritoneAutoTest.INSTANCE);
- }
-
- this.initialized = true;
- }
-
- @Override
- public PathingControlManager getPathingControlManager() {
- return this.pathingControlManager;
- }
-
- public List getBehaviors() {
- return this.behaviors;
- }
-
- public void registerBehavior(Behavior behavior) {
- this.behaviors.add(behavior);
- this.gameEventHandler.registerEventListener(behavior);
- }
-
- @Override
- public InputOverrideHandler getInputOverrideHandler() {
- return this.inputOverrideHandler;
- }
-
- @Override
- public CustomGoalProcess getCustomGoalProcess() { // Iffy
- return this.customGoalProcess;
- }
-
- @Override
- public GetToBlockProcess getGetToBlockProcess() { // Iffy
- return this.getToBlockProcess;
- }
-
- @Override
- public IPlayerContext getPlayerContext() {
- return this.playerContext;
- }
-
- public MemoryBehavior getMemoryBehavior() {
- return this.memoryBehavior;
- }
-
- @Override
- public FollowProcess getFollowProcess() {
- return this.followProcess;
- }
-
- @Override
- public BuilderProcess getBuilderProcess() {
- return this.builderProcess;
- }
-
- public InventoryBehavior getInventoryBehavior() {
- return this.inventoryBehavior;
- }
-
- @Override
- public LookBehavior getLookBehavior() {
- return this.lookBehavior;
- }
-
- @Override
- public MineProcess getMineProcess() {
- return this.mineProcess;
- }
-
- @Override
- public PathingBehavior getPathingBehavior() {
- return this.pathingBehavior;
- }
-
- @Override
- public WorldProvider getWorldProvider() {
- return this.worldProvider;
- }
-
- @Override
- public IEventBus getGameEventHandler() {
- return this.gameEventHandler;
- }
-
- public static Settings settings() {
- return BaritoneAPI.getSettings();
- }
-
- public static File getDir() {
- return dir;
- }
-
- public static Executor getExecutor() {
- return threadPool;
- }
-}
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone. If not, see .
+ */
+
+package baritone;
+
+import baritone.api.BaritoneAPI;
+import baritone.api.IBaritone;
+import baritone.api.Settings;
+import baritone.api.event.listener.IEventBus;
+import baritone.api.utils.IPlayerContext;
+import baritone.behavior.*;
+import baritone.cache.WorldProvider;
+import baritone.event.GameEventHandler;
+import baritone.process.*;
+import baritone.utils.*;
+import baritone.utils.player.PrimaryPlayerContext;
+import net.minecraft.client.Minecraft;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Brady
+ * @since 7/31/2018
+ */
+public class Baritone implements IBaritone {
+
+ private static ThreadPoolExecutor threadPool;
+ private static File dir;
+
+ static {
+ threadPool = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>());
+
+ dir = new File(Minecraft.getMinecraft().gameDir, "baritone");
+ if (!Files.exists(dir.toPath())) {
+ try {
+ Files.createDirectories(dir.toPath());
+ } catch (IOException ignored) {}
+ }
+ }
+
+ /**
+ * Whether or not {@link Baritone#init()} has been called yet
+ */
+ private boolean initialized;
+
+ private GameEventHandler gameEventHandler;
+
+ private List behaviors;
+ private PathingBehavior pathingBehavior;
+ private LookBehavior lookBehavior;
+ private MemoryBehavior memoryBehavior;
+ private InventoryBehavior inventoryBehavior;
+ private InputOverrideHandler inputOverrideHandler;
+
+ private FollowProcess followProcess;
+ private MineProcess mineProcess;
+ private GetToBlockProcess getToBlockProcess;
+ private CustomGoalProcess customGoalProcess;
+ private BuilderProcess builderProcess;
+
+ private PathingControlManager pathingControlManager;
+
+ private IPlayerContext playerContext;
+ private WorldProvider worldProvider;
+
+ public BlockStateInterface bsi;
+
+ Baritone() {
+ this.gameEventHandler = new GameEventHandler(this);
+ }
+
+ @Override
+ public synchronized void init() {
+ if (initialized) {
+ return;
+ }
+
+ // Define this before behaviors try and get it, or else it will be null and the builds will fail!
+ this.playerContext = PrimaryPlayerContext.INSTANCE;
+
+ this.behaviors = new ArrayList<>();
+ {
+ // the Behavior constructor calls baritone.registerBehavior(this) so this populates the behaviors arraylist
+ pathingBehavior = new PathingBehavior(this);
+ lookBehavior = new LookBehavior(this);
+ memoryBehavior = new MemoryBehavior(this);
+ inventoryBehavior = new InventoryBehavior(this);
+ inputOverrideHandler = new InputOverrideHandler(this);
+ new ExampleBaritoneControl(this);
+ }
+
+ this.pathingControlManager = new PathingControlManager(this);
+ {
+ followProcess = new FollowProcess(this);
+ mineProcess = new MineProcess(this);
+ customGoalProcess = new CustomGoalProcess(this); // very high iq
+ getToBlockProcess = new GetToBlockProcess(this);
+ builderProcess = new BuilderProcess(this);
+ }
+
+ this.worldProvider = new WorldProvider();
+
+ if (BaritoneAutoTest.ENABLE_AUTO_TEST) {
+ this.gameEventHandler.registerEventListener(BaritoneAutoTest.INSTANCE);
+ }
+
+ this.initialized = true;
+ }
+
+ @Override
+ public PathingControlManager getPathingControlManager() {
+ return this.pathingControlManager;
+ }
+
+ public List getBehaviors() {
+ return this.behaviors;
+ }
+
+ public void registerBehavior(Behavior behavior) {
+ this.behaviors.add(behavior);
+ this.gameEventHandler.registerEventListener(behavior);
+ }
+
+ @Override
+ public InputOverrideHandler getInputOverrideHandler() {
+ return this.inputOverrideHandler;
+ }
+
+ @Override
+ public CustomGoalProcess getCustomGoalProcess() { // Iffy
+ return this.customGoalProcess;
+ }
+
+ @Override
+ public GetToBlockProcess getGetToBlockProcess() { // Iffy
+ return this.getToBlockProcess;
+ }
+
+ @Override
+ public IPlayerContext getPlayerContext() {
+ return this.playerContext;
+ }
+
+ public MemoryBehavior getMemoryBehavior() {
+ return this.memoryBehavior;
+ }
+
+ @Override
+ public FollowProcess getFollowProcess() {
+ return this.followProcess;
+ }
+
+ @Override
+ public BuilderProcess getBuilderProcess() {
+ return this.builderProcess;
+ }
+
+ public InventoryBehavior getInventoryBehavior() {
+ return this.inventoryBehavior;
+ }
+
+ @Override
+ public LookBehavior getLookBehavior() {
+ return this.lookBehavior;
+ }
+
+ @Override
+ public MineProcess getMineProcess() {
+ return this.mineProcess;
+ }
+
+ @Override
+ public PathingBehavior getPathingBehavior() {
+ return this.pathingBehavior;
+ }
+
+ @Override
+ public WorldProvider getWorldProvider() {
+ return this.worldProvider;
+ }
+
+ @Override
+ public IEventBus getGameEventHandler() {
+ return this.gameEventHandler;
+ }
+
+ public static Settings settings() {
+ return BaritoneAPI.getSettings();
+ }
+
+ public static File getDir() {
+ return dir;
+ }
+
+ public static Executor getExecutor() {
+ return threadPool;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/baritone/cache/CachedChunk.java b/src/main/java/baritone/cache/CachedChunk.java
index ebf0bfc9..d2737190 100644
--- a/src/main/java/baritone/cache/CachedChunk.java
+++ b/src/main/java/baritone/cache/CachedChunk.java
@@ -85,6 +85,7 @@ public final class CachedChunk {
temp.add(Blocks.END_GATEWAY);
temp.add(Blocks.WEB);
temp.add(Blocks.NETHER_WART);
+ temp.add(Blocks.LADDER);
BLOCKS_TO_KEEP_TRACK_OF = Collections.unmodifiableSet(temp);
}
diff --git a/src/main/java/baritone/cache/ChunkPacker.java b/src/main/java/baritone/cache/ChunkPacker.java
index e2903cea..892369d5 100644
--- a/src/main/java/baritone/cache/ChunkPacker.java
+++ b/src/main/java/baritone/cache/ChunkPacker.java
@@ -19,10 +19,7 @@ package baritone.cache;
import baritone.pathing.movement.MovementHelper;
import baritone.utils.pathing.PathingBlockType;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockDoublePlant;
-import net.minecraft.block.BlockFlower;
-import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.*;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.util.ResourceLocation;
@@ -73,7 +70,7 @@ public final class ChunkPacker {
for (int x = 0; x < 16; x++) {
int index = CachedChunk.getPositionIndex(x, y, z);
IBlockState state = bsc.get(x, y1, z);
- boolean[] bits = getPathingBlockType(state).getBits();
+ boolean[] bits = getPathingBlockType(state, chunk, x, y, z).getBits();
bitSet.set(index, bits[0]);
bitSet.set(index + 1, bits[1]);
Block block = state.getBlock();
@@ -122,11 +119,17 @@ public final class ChunkPacker {
return resourceCache.computeIfAbsent(name, n -> Block.getBlockFromName(n.contains(":") ? n : "minecraft:" + n));
}
- private static PathingBlockType getPathingBlockType(IBlockState state) {
+ private static PathingBlockType getPathingBlockType(IBlockState state, Chunk chunk, int x, int y, int z) {
Block block = state.getBlock();
- if ((block == Blocks.WATER || block == Blocks.FLOWING_WATER) && !MovementHelper.isFlowing(state)) {
+ if (block == Blocks.WATER || block == Blocks.FLOWING_WATER) {
// only water source blocks are plausibly usable, flowing water should be avoid
// FLOWING_WATER is a waterfall, it doesn't really matter and caching it as AVOID just makes it look wrong
+ if (!MovementHelper.possiblyFlowing(state)) {
+ return PathingBlockType.WATER;
+ }
+ if (BlockLiquid.getSlopeAngle(chunk.getWorld(), new BlockPos(x + chunk.x << 4, y, z + chunk.z << 4), state.getMaterial(), state) != -1000.0F) {
+ return PathingBlockType.AVOID;
+ }
return PathingBlockType.WATER;
}
diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java
index 77b59db2..10659c3e 100644
--- a/src/main/java/baritone/pathing/movement/MovementHelper.java
+++ b/src/main/java/baritone/pathing/movement/MovementHelper.java
@@ -37,6 +37,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
+import java.util.Optional;
+
import static baritone.pathing.movement.Movement.HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP;
/**
@@ -71,7 +73,7 @@ public interface MovementHelper extends ActionCosts, Helper {
if (block == Blocks.AIR) { // early return for most common case
return true;
}
- if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.WEB || block == Blocks.END_PORTAL || block == Blocks.COCOA) {
+ if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.WEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof BlockSkull) {
return false;
}
if (block instanceof BlockDoor || block instanceof BlockFenceGate) {
@@ -107,7 +109,7 @@ public interface MovementHelper extends ActionCosts, Helper {
}
throw new IllegalStateException();
}
- if (isFlowing(state)) {
+ if (isFlowing(x, y, z, state, bsi)) {
return false; // Don't walk through flowing liquids
}
if (block instanceof BlockLiquid) {
@@ -157,7 +159,8 @@ public interface MovementHelper extends ActionCosts, Helper {
|| block instanceof BlockSnow
|| block instanceof BlockLiquid
|| block instanceof BlockTrapDoor
- || block instanceof BlockEndPortal) {
+ || block instanceof BlockEndPortal
+ || block instanceof BlockSkull) {
return false;
}
// door, fence gate, liquid, trapdoor have been accounted for, nothing else uses the world or pos parameters
@@ -285,10 +288,10 @@ public interface MovementHelper extends ActionCosts, Helper {
// since this is called literally millions of times per second, the benefit of not allocating millions of useless "pos.up()"
// BlockPos s that we'd just garbage collect immediately is actually noticeable. I don't even think its a decrease in readability
Block up = bsi.get0(x, y + 1, z).getBlock();
- if (up == Blocks.WATERLILY) {
+ if (up == Blocks.WATERLILY || up == Blocks.CARPET) {
return true;
}
- if (isFlowing(state) || block == Blocks.FLOWING_WATER) {
+ if (isFlowing(x, y, z, state, bsi) || block == Blocks.FLOWING_WATER) {
// the only scenario in which we can walk on flowing water is if it's under still water with jesus off
return isWater(up) && !Baritone.settings().assumeWalkOnWater.get();
}
@@ -453,15 +456,34 @@ public interface MovementHelper extends ActionCosts, Helper {
return BlockStateInterface.getBlock(ctx, p) instanceof BlockLiquid;
}
- static boolean isFlowing(IBlockState state) {
+ static boolean possiblyFlowing(IBlockState state) {
// Will be IFluidState in 1.13
return state.getBlock() instanceof BlockLiquid
&& state.getValue(BlockLiquid.LEVEL) != 0;
}
+ static boolean isFlowing(int x, int y, int z, IBlockState state, BlockStateInterface bsi) {
+ if (!(state.getBlock() instanceof BlockLiquid)) {
+ return false;
+ }
+ if (state.getValue(BlockLiquid.LEVEL) != 0) {
+ return true;
+ }
+ return possiblyFlowing(bsi.get0(x + 1, y, z))
+ || possiblyFlowing(bsi.get0(x - 1, y, z))
+ || possiblyFlowing(bsi.get0(x, y, z + 1))
+ || possiblyFlowing(bsi.get0(x, y, z - 1));
+ }
+
+
static PlaceResult attemptToPlaceABlock(MovementState state, IBaritone baritone, BlockPos placeAt, boolean preferDown) {
IPlayerContext ctx = baritone.getPlayerContext();
+ Optional direct = RotationUtils.reachable(ctx, placeAt); // we assume that if there is a block there, it must be replacable
boolean found = false;
+ if (direct.isPresent()) {
+ state.setTarget(new MovementState.MovementTarget(direct.get(), true));
+ found = true;
+ }
for (int i = 0; i < 5; i++) {
BlockPos against1 = placeAt.offset(HORIZONTALS_BUT_ALSO_DOWN____SO_EVERY_DIRECTION_EXCEPT_UP[i]);
if (MovementHelper.canPlaceAgainst(ctx, against1)) {
diff --git a/src/main/java/baritone/pathing/movement/movements/MovementDescend.java b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java
index 5e06bc00..a0f701e6 100644
--- a/src/main/java/baritone/pathing/movement/movements/MovementDescend.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java
@@ -143,7 +143,7 @@ public class MovementDescend extends Movement {
if (context.assumeWalkOnWater) {
return false; // TODO fix
}
- if (MovementHelper.isFlowing(ontoBlock)) {
+ if (MovementHelper.isFlowing(destX, newY, destZ, ontoBlock, context.bsi)) {
return false; // TODO flowing check required here?
}
if (!MovementHelper.canWalkOn(context.bsi, destX, newY - 1, destZ)) {
@@ -202,7 +202,8 @@ public class MovementDescend extends Movement {
}
BlockPos playerFeet = ctx.playerFeet();
- if (playerFeet.equals(dest) && (MovementHelper.isLiquid(ctx, dest) || ctx.player().posY - playerFeet.getY() < 0.094)) { // lilypads
+ BlockPos fakeDest = new BlockPos(dest.getX() * 2 - src.getX(), dest.getY(), dest.getZ() * 2 - src.getZ());
+ if ((playerFeet.equals(dest) || playerFeet.equals(fakeDest)) && (MovementHelper.isLiquid(ctx, dest) || ctx.player().posY - dest.getY() < 0.5)) { // lilypads
// Wait until we're actually on the ground before saying we're done because sometimes we continue to fall if the next action starts immediately
return state.setStatus(MovementStatus.SUCCESS);
/* else {
@@ -228,12 +229,8 @@ public class MovementDescend extends Movement {
double z = ctx.player().posZ - (src.getZ() + 0.5);
double fromStart = Math.sqrt(x * x + z * z);
if (!playerFeet.equals(dest) || ab > 0.25) {
- BlockPos fakeDest = new BlockPos(dest.getX() * 2 - src.getX(), dest.getY(), dest.getZ() * 2 - src.getZ());
- if (numTicks++ < 20) {
+ if (numTicks++ < 20 && fromStart < 1.25) {
MovementHelper.moveTowards(ctx, state, fakeDest);
- if (fromStart > 1.25) {
- state.getTarget().rotation = new Rotation(state.getTarget().rotation.getYaw() + 180F, state.getTarget().rotation.getPitch());
- }
} else {
MovementHelper.moveTowards(ctx, state, dest);
}
diff --git a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java b/src/main/java/baritone/pathing/movement/movements/MovementParkour.java
index bade6fe1..ce5f77e9 100644
--- a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementParkour.java
@@ -28,6 +28,7 @@ import baritone.pathing.movement.MovementState;
import baritone.utils.BlockStateInterface;
import baritone.utils.pathing.MutableMoveResult;
import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
import net.minecraft.block.BlockStairs;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
@@ -85,7 +86,7 @@ public class MovementParkour extends Movement {
return;
}
IBlockState standingOn = context.get(x, y - 1, z);
- if (standingOn.getBlock() == Blocks.VINE || standingOn.getBlock() == Blocks.LADDER || standingOn.getBlock() instanceof BlockStairs || MovementHelper.isBottomSlab(standingOn)) {
+ if (standingOn.getBlock() == Blocks.VINE || standingOn.getBlock() == Blocks.LADDER || standingOn.getBlock() instanceof BlockStairs || MovementHelper.isBottomSlab(standingOn) || standingOn.getBlock() instanceof BlockLiquid) {
return;
}
int maxJump;
diff --git a/src/main/java/baritone/pathing/movement/movements/MovementPillar.java b/src/main/java/baritone/pathing/movement/movements/MovementPillar.java
index 2ce03d69..79423bcc 100644
--- a/src/main/java/baritone/pathing/movement/movements/MovementPillar.java
+++ b/src/main/java/baritone/pathing/movement/movements/MovementPillar.java
@@ -235,7 +235,7 @@ public class MovementPillar extends Movement {
if (!(fr instanceof BlockAir || fr.isReplaceable(ctx.world(), src))) {
state.setInput(Input.CLICK_LEFT, true);
blockIsThere = false;
- } else if (ctx.player().isSneaking() && (Objects.equals(src.down(), ctx.objectMouseOver().getBlockPos()) || Objects.equals(src, ctx.objectMouseOver().getBlockPos()))) { // 1 tick after we're able to place
+ } else if (ctx.player().isSneaking() && (Objects.equals(src.down(), ctx.objectMouseOver().getBlockPos()) || Objects.equals(src, ctx.objectMouseOver().getBlockPos())) && ctx.player().posY > dest.getY() + 0.1) {
state.setInput(Input.CLICK_RIGHT, true);
}
}
diff --git a/src/main/java/baritone/pathing/path/PathExecutor.java b/src/main/java/baritone/pathing/path/PathExecutor.java
index 4d3b5f3b..494c83f7 100644
--- a/src/main/java/baritone/pathing/path/PathExecutor.java
+++ b/src/main/java/baritone/pathing/path/PathExecutor.java
@@ -106,33 +106,31 @@ public class PathExecutor implements IPathExecutor, Helper {
}
BetterBlockPos whereShouldIBe = path.positions().get(pathPosition);
BetterBlockPos whereAmI = ctx.playerFeet();
- if (!whereShouldIBe.equals(whereAmI)) {
- if (!Blocks.AIR.equals(BlockStateInterface.getBlock(ctx, whereAmI.down()))) {//do not skip if standing on air, because our position isn't stable to skip
- for (int i = 0; i < pathPosition - 1 && i < path.length(); i++) {//this happens for example when you lag out and get teleported back a couple blocks
- if (whereAmI.equals(path.positions().get(i))) {
- logDebug("Skipping back " + (pathPosition - i) + " steps, to " + i);
- int previousPos = pathPosition;
- pathPosition = Math.max(i - 1, 0); // previous step might not actually be done
- for (int j = pathPosition; j <= previousPos; j++) {
- path.movements().get(j).reset();
- }
- onChangeInPathPosition();
- onTick();
- return false;
+ if (!whereShouldIBe.equals(whereAmI) && !Blocks.AIR.equals(BlockStateInterface.getBlock(ctx, whereAmI.down()))) {//do not skip if standing on air, because our position isn't stable to skip
+ for (int i = 0; i < pathPosition - 1 && i < path.length(); i++) {//this happens for example when you lag out and get teleported back a couple blocks
+ if (whereAmI.equals(path.positions().get(i))) {
+ logDebug("Skipping back " + (pathPosition - i) + " steps, to " + i);
+ int previousPos = pathPosition;
+ pathPosition = Math.max(i - 1, 0); // previous step might not actually be done
+ for (int j = pathPosition; j <= previousPos; j++) {
+ path.movements().get(j).reset();
}
+ onChangeInPathPosition();
+ onTick();
+ return false;
}
- for (int i = pathPosition + 3; i < path.length(); i++) { //dont check pathPosition+1. the movement tells us when it's done (e.g. sneak placing)
- // also don't check pathPosition+2 because reasons
- if (whereAmI.equals(path.positions().get(i))) {
- if (i - pathPosition > 2) {
- logDebug("Skipping forward " + (i - pathPosition) + " steps, to " + i);
- }
- //System.out.println("Double skip sundae");
- pathPosition = i - 1;
- onChangeInPathPosition();
- onTick();
- return false;
+ }
+ for (int i = pathPosition + 3; i < path.length(); i++) { //dont check pathPosition+1. the movement tells us when it's done (e.g. sneak placing)
+ // also don't check pathPosition+2 because reasons
+ if (whereAmI.equals(path.positions().get(i))) {
+ if (i - pathPosition > 2) {
+ logDebug("Skipping forward " + (i - pathPosition) + " steps, to " + i);
}
+ //System.out.println("Double skip sundae");
+ pathPosition = i - 1;
+ onChangeInPathPosition();
+ onTick();
+ return false;
}
}
}
@@ -391,7 +389,7 @@ public class PathExecutor implements IPathExecutor, Helper {
if (current instanceof MovementTraverse && pathPosition < path.length() - 3) {
IMovement next = path.movements().get(pathPosition + 1);
if (next instanceof MovementAscend && sprintableAscend(ctx, (MovementTraverse) current, (MovementAscend) next, path.movements().get(pathPosition + 2))) {
- if (skipNow(ctx, current, next)) {
+ if (skipNow(ctx, current)) {
logDebug("Skipping traverse to straight ascend");
pathPosition++;
onChangeInPathPosition();
@@ -513,7 +511,7 @@ public class PathExecutor implements IPathExecutor, Helper {
movement.getDest().add(flatDir.getX() * (i - pathPosition), 0, flatDir.getZ() * (i - pathPosition)));
}
- private static boolean skipNow(IPlayerContext ctx, IMovement current, IMovement next) {
+ private static boolean skipNow(IPlayerContext ctx, IMovement current) {
double offTarget = Math.abs(current.getDirection().getX() * (current.getSrc().z + 0.5D - ctx.player().posZ)) + Math.abs(current.getDirection().getZ() * (current.getSrc().x + 0.5D - ctx.player().posX));
if (offTarget > 0.1) {
return false;
@@ -561,10 +559,7 @@ public class PathExecutor implements IPathExecutor, Helper {
if (MovementHelper.avoidWalkingInto(ctx.world().getBlockState(current.getSrc().up(3)).getBlock())) {
return false;
}
- if (MovementHelper.avoidWalkingInto(ctx.world().getBlockState(next.getDest().up(2)).getBlock())) {
- return false;
- }
- return true;
+ return !MovementHelper.avoidWalkingInto(ctx.world().getBlockState(next.getDest().up(2)).getBlock()); // codacy smh my head
}
private static boolean canSprintFromDescendInto(IPlayerContext ctx, IMovement current, IMovement next) {
diff --git a/src/main/java/baritone/process/CustomGoalProcess.java b/src/main/java/baritone/process/CustomGoalProcess.java
index 1c4e0311..a6234227 100644
--- a/src/main/java/baritone/process/CustomGoalProcess.java
+++ b/src/main/java/baritone/process/CustomGoalProcess.java
@@ -55,6 +55,9 @@ public class CustomGoalProcess extends BaritoneProcessHelper implements ICustomG
if (this.state == State.NONE) {
this.state = State.GOAL_SET;
}
+ if (this.state == State.EXECUTING) {
+ this.state = State.PATH_REQUESTED;
+ }
}
@Override
@@ -81,7 +84,7 @@ public class CustomGoalProcess extends BaritoneProcessHelper implements ICustomG
}
return new PathingCommand(this.goal, PathingCommandType.CANCEL_AND_SET_GOAL);
case PATH_REQUESTED:
- PathingCommand ret = new PathingCommand(this.goal, PathingCommandType.SET_GOAL_AND_PATH);
+ PathingCommand ret = new PathingCommand(this.goal, PathingCommandType.FORCE_REVALIDATE_GOAL_AND_PATH);
this.state = State.EXECUTING;
return ret;
case EXECUTING:
diff --git a/src/main/java/baritone/process/GetToBlockProcess.java b/src/main/java/baritone/process/GetToBlockProcess.java
index 0eb9f339..cb80926b 100644
--- a/src/main/java/baritone/process/GetToBlockProcess.java
+++ b/src/main/java/baritone/process/GetToBlockProcess.java
@@ -131,8 +131,11 @@ public class GetToBlockProcess extends BaritoneProcessHelper implements IGetToBl
}
}
}
- if (true) {
- break; // codacy gets mad if i just end on a break LOL
+ // i can't do break; (codacy gets mad), and i can't do if(true){break}; (codacy gets mad)
+ // so i will do this
+ switch (newBlacklist.size()) {
+ default:
+ break outer;
}
}
logDebug("Blacklisting unreachable locations " + newBlacklist);
diff --git a/src/main/java/baritone/utils/BaritoneAutoTest.java b/src/main/java/baritone/utils/BaritoneAutoTest.java
index b7ae5fbb..c798c563 100644
--- a/src/main/java/baritone/utils/BaritoneAutoTest.java
+++ b/src/main/java/baritone/utils/BaritoneAutoTest.java
@@ -115,7 +115,9 @@ public class BaritoneAutoTest implements AbstractGameEventListener, Helper {
}
// Setup Baritone's pathing goal and (if needed) begin pathing
- BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(GOAL);
+ if (!BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().isActive()) {
+ BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(GOAL);
+ }
// If we have reached our goal, print a message and safely close the game
if (GOAL.isInGoal(ctx.playerFeet())) {
diff --git a/src/main/java/baritone/utils/BlockBreakHelper.java b/src/main/java/baritone/utils/BlockBreakHelper.java
index b410e6b3..db56b91f 100644
--- a/src/main/java/baritone/utils/BlockBreakHelper.java
+++ b/src/main/java/baritone/utils/BlockBreakHelper.java
@@ -31,7 +31,7 @@ public final class BlockBreakHelper implements Helper {
private boolean didBreakLastTick;
- private IPlayerContext playerContext;
+ private final IPlayerContext playerContext;
public BlockBreakHelper(IPlayerContext playerContext) {
this.playerContext = playerContext;
diff --git a/src/main/java/baritone/utils/BlockPlaceHelper.java b/src/main/java/baritone/utils/BlockPlaceHelper.java
new file mode 100644
index 00000000..e93bf807
--- /dev/null
+++ b/src/main/java/baritone/utils/BlockPlaceHelper.java
@@ -0,0 +1,51 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone. If not, see .
+ */
+
+package baritone.utils;
+
+import baritone.Baritone;
+import baritone.api.utils.IPlayerContext;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.RayTraceResult;
+
+public class BlockPlaceHelper implements Helper {
+ private final IPlayerContext ctx;
+ private int rightClickTimer;
+
+ public BlockPlaceHelper(IPlayerContext playerContext) {
+ this.ctx = playerContext;
+ }
+
+ public void tick(boolean rightClickRequested) {
+ if (rightClickTimer > 0) {
+ rightClickTimer--;
+ return;
+ }
+ RayTraceResult mouseOver = ctx.objectMouseOver();
+ if (!rightClickRequested || ctx.player().isRowingBoat() || mouseOver == null || mouseOver.getBlockPos() == null || mouseOver.typeOfHit != RayTraceResult.Type.BLOCK) {
+ return;
+ }
+ rightClickTimer = Baritone.settings().rightClickSpeed.get();
+ for (EnumHand hand : EnumHand.values()) {
+ if (ctx.playerController().processRightClickBlock(ctx.player(), ctx.world(), mouseOver.getBlockPos(), mouseOver.sideHit, mouseOver.hitVec, hand) == EnumActionResult.SUCCESS) {
+ ctx.player().swingArm(hand);
+ return;
+ }
+ }
+ }
+}
diff --git a/src/main/java/baritone/utils/ExampleBaritoneControl.java b/src/main/java/baritone/utils/ExampleBaritoneControl.java
index c7eaae38..97d58162 100644
--- a/src/main/java/baritone/utils/ExampleBaritoneControl.java
+++ b/src/main/java/baritone/utils/ExampleBaritoneControl.java
@@ -118,12 +118,33 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
return true;
}
}
- if (msg.equals("baritone") || msg.equals("settings")) {
- for (Settings.Setting setting : Baritone.settings().allSettings) {
+ if (msg.equals("baritone") || msg.equals("modifiedsettings") || msg.startsWith("settings m") || msg.equals("modified")) {
+ logDirect("All settings that have been modified from their default values:");
+ for (Settings.Setting setting : SettingsUtil.modifiedSettings(Baritone.settings())) {
logDirect(setting.toString());
}
return true;
}
+ if (msg.startsWith("settings")) {
+ String rest = msg.substring("settings".length());
+ try {
+ int page = Integer.parseInt(rest.trim());
+ int min = page * 10;
+ int max = Math.min(Baritone.settings().allSettings.size(), (page + 1) * 10);
+ logDirect("Settings " + min + " to " + (max - 1) + ":");
+ for (int i = min; i < max; i++) {
+ logDirect(Baritone.settings().allSettings.get(i).toString());
+ }
+ } catch (Exception ex) { // NumberFormatException | ArrayIndexOutOfBoundsException and probably some others I'm forgetting lol
+ ex.printStackTrace();
+ logDirect("All settings:");
+ for (Settings.Setting setting : Baritone.settings().allSettings) {
+ logDirect(setting.toString());
+ }
+ logDirect("To get one page of ten settings at a time, do settings ");
+ }
+ return true;
+ }
if (msg.equals("") || msg.equals("help") || msg.equals("?")) {
for (String line : HELP_MSG.split("\n")) {
logDirect(line);
@@ -131,31 +152,24 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
return true;
}
if (msg.contains(" ")) {
- String[] data = msg.split(" ");
- if (data.length == 2) {
- Settings.Setting setting = Baritone.settings().byLowerName.get(data[0]);
- if (setting != null) {
+ String settingName = msg.substring(0, msg.indexOf(' '));
+ String settingValue = msg.substring(msg.indexOf(' ') + 1);
+ Settings.Setting setting = Baritone.settings().byLowerName.get(settingName);
+ if (setting != null) {
+ if (settingValue.equals("reset")) {
+ logDirect("Resetting setting " + settingName + " to default value.");
+ setting.reset();
+ } else {
try {
- if (setting.value.getClass() == Long.class) {
- setting.value = Long.parseLong(data[1]);
- }
- if (setting.value.getClass() == Integer.class) {
- setting.value = Integer.parseInt(data[1]);
- }
- if (setting.value.getClass() == Double.class) {
- setting.value = Double.parseDouble(data[1]);
- }
- if (setting.value.getClass() == Float.class) {
- setting.value = Float.parseFloat(data[1]);
- }
- } catch (NumberFormatException e) {
- logDirect("Unable to parse " + data[1]);
+ SettingsUtil.parseAndApply(Baritone.settings(), settingName, settingValue);
+ } catch (Exception ex) {
+ logDirect("Unable to parse setting");
return true;
}
- SettingsUtil.save(Baritone.settings());
- logDirect(setting.toString());
- return true;
}
+ SettingsUtil.save(Baritone.settings());
+ logDirect(setting.toString());
+ return true;
}
}
if (Baritone.settings().byLowerName.containsKey(msg)) {
@@ -254,6 +268,11 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
logDirect(success ? "Loaded" : "Unable to load");
return true;
}
+ if (msg.equals("come")) {
+ customGoalProcess.setGoalAndPath(new GoalBlock(new BlockPos(mc.getRenderViewEntity())));
+ logDirect("Coming");
+ return true;
+ }
if (msg.equals("axis") || msg.equals("highway")) {
customGoalProcess.setGoalAndPath(new GoalAxis());
return true;
@@ -325,7 +344,10 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
return true;
}
if (msg.equals("reset")) {
- Baritone.settings().reset();
+ for (Settings.Setting setting : Baritone.settings().allSettings) {
+ setting.reset();
+ }
+ SettingsUtil.save(Baritone.settings());
logDirect("Baritone settings reset");
return true;
}
@@ -432,6 +454,16 @@ public class ExampleBaritoneControl extends Behavior implements Helper {
logDirect("Started mining blocks of type " + Arrays.toString(blockTypes));
return true;
}
+ if (msg.equals("click")) {
+ new Thread(() -> {
+ try {
+ Thread.sleep(100);
+ mc.addScheduledTask(() -> mc.displayGuiScreen(new GuiClickMeme()));
+ } catch (Exception ignored) {}
+ }).start();
+ logDirect("aight dude");
+ return true;
+ }
if (msg.startsWith("thisway") || msg.startsWith("forward")) {
try {
Goal goal = GoalXZ.fromDirection(ctx.playerFeetAsVec(), ctx.player().rotationYaw, Double.parseDouble(msg.substring(7).trim()));
diff --git a/src/main/java/baritone/utils/GuiClickMeme.java b/src/main/java/baritone/utils/GuiClickMeme.java
new file mode 100644
index 00000000..1db794ba
--- /dev/null
+++ b/src/main/java/baritone/utils/GuiClickMeme.java
@@ -0,0 +1,102 @@
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone. If not, see .
+ */
+
+package baritone.utils;
+
+import baritone.api.BaritoneAPI;
+import baritone.api.pathing.goals.GoalBlock;
+import baritone.api.pathing.goals.GoalTwoBlocks;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import org.lwjgl.BufferUtils;
+import org.lwjgl.input.Mouse;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.util.glu.GLU;
+
+import java.awt.*;
+import java.io.IOException;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.util.Collections;
+
+import static org.lwjgl.opengl.GL11.*;
+
+public class GuiClickMeme extends GuiScreen {
+
+ // My name is Brady and I grant Leijurv permission to use this pasted code
+ private final FloatBuffer MODELVIEW = BufferUtils.createFloatBuffer(16);
+ private final FloatBuffer PROJECTION = BufferUtils.createFloatBuffer(16);
+ private final IntBuffer VIEWPORT = BufferUtils.createIntBuffer(16);
+ private final FloatBuffer TO_SCREEN_BUFFER = BufferUtils.createFloatBuffer(3);
+ private final FloatBuffer TO_WORLD_BUFFER = BufferUtils.createFloatBuffer(3);
+
+ private BlockPos meme;
+
+ @Override
+ public boolean doesGuiPauseGame() {
+ return false;
+ }
+
+ @Override
+ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+ int mx = Mouse.getX();
+ int my = Mouse.getY();
+ Vec3d near = toWorld(mx, my, 0);
+ Vec3d far = toWorld(mx, my, 1); // "Use 0.945 that's what stack overflow says" - Leijurv
+ if (near != null && far != null) {
+ Vec3d viewerPos = new Vec3d(mc.getRenderManager().viewerPosX, mc.getRenderManager().viewerPosY, mc.getRenderManager().viewerPosZ);
+ RayTraceResult result = mc.world.rayTraceBlocks(near.add(viewerPos), far.add(viewerPos), false, false, true);
+ if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) {
+ meme = result.getBlockPos();
+ }
+ }
+ }
+
+ @Override
+ protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
+ super.mouseClicked(mouseX, mouseY, mouseButton);
+ if (mouseButton == 0) {
+ BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalTwoBlocks(meme));
+ } else if (mouseButton == 1) {
+ BaritoneAPI.getProvider().getPrimaryBaritone().getCustomGoalProcess().setGoalAndPath(new GoalBlock(meme.up()));
+ }
+ }
+
+ public void onRender(float partialTicks) {
+ GlStateManager.getFloat(GL_MODELVIEW_MATRIX, (FloatBuffer) MODELVIEW.clear());
+ GlStateManager.getFloat(GL_PROJECTION_MATRIX, (FloatBuffer) PROJECTION.clear());
+ GlStateManager.glGetInteger(GL_VIEWPORT, (IntBuffer) VIEWPORT.clear());
+
+ if (meme != null) {
+ Entity e = mc.getRenderViewEntity();
+ // drawSingleSelectionBox WHEN?
+ PathRenderer.drawManySelectionBoxes(e, Collections.singletonList(meme), Color.CYAN);
+ }
+ }
+
+ public Vec3d toWorld(double x, double y, double z) {
+ boolean result = GLU.gluUnProject((float) x, (float) y, (float) z, MODELVIEW, PROJECTION, VIEWPORT, (FloatBuffer) TO_WORLD_BUFFER.clear());
+ if (result) {
+ return new Vec3d(TO_WORLD_BUFFER.get(0), TO_WORLD_BUFFER.get(1), TO_WORLD_BUFFER.get(2));
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/baritone/utils/Helper.java b/src/main/java/baritone/utils/Helper.java
index 9ee6ed59..f85f240c 100755
--- a/src/main/java/baritone/utils/Helper.java
+++ b/src/main/java/baritone/utils/Helper.java
@@ -1,72 +1,72 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone. If not, see .
- */
-
-package baritone.utils;
-
-import baritone.Baritone;
-import net.minecraft.client.Minecraft;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextFormatting;
-
-/**
- * @author Brady
- * @since 8/1/2018
- */
-public interface Helper {
-
- /**
- * Instance of {@link Helper}. Used for static-context reference.
- */
- Helper HELPER = new Helper() {};
-
- 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();
-
- /**
- * Send a message to chat only if chatDebug is on
- *
- * @param message The message to display in chat
- */
- default void logDebug(String message) {
- if (!Baritone.settings().chatDebug.get()) {
- //System.out.println("Suppressed debug message:");
- //System.out.println(message);
- return;
- }
- logDirect(message);
- }
-
- /**
- * Send a message to chat regardless of chatDebug (should only be used for critically important messages, or as a direct response to a chat command)
- *
- * @param message The message to display in chat
- */
- default void logDirect(String message) {
- ITextComponent component = MESSAGE_PREFIX.createCopy();
- component.getStyle().setColor(TextFormatting.GRAY);
- component.appendSibling(new TextComponentString(" " + message));
- Minecraft.getMinecraft().addScheduledTask(() -> Baritone.settings().logger.get().accept(component));
- }
-}
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone. If not, see .
+ */
+
+package baritone.utils;
+
+import baritone.Baritone;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.TextFormatting;
+
+/**
+ * @author Brady
+ * @since 8/1/2018
+ */
+public interface Helper {
+
+ /**
+ * Instance of {@link Helper}. Used for static-context reference.
+ */
+ Helper HELPER = new Helper() {};
+
+ 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();
+
+ /**
+ * Send a message to chat only if chatDebug is on
+ *
+ * @param message The message to display in chat
+ */
+ default void logDebug(String message) {
+ if (!Baritone.settings().chatDebug.get()) {
+ //System.out.println("Suppressed debug message:");
+ //System.out.println(message);
+ return;
+ }
+ logDirect(message);
+ }
+
+ /**
+ * Send a message to chat regardless of chatDebug (should only be used for critically important messages, or as a direct response to a chat command)
+ *
+ * @param message The message to display in chat
+ */
+ default void logDirect(String message) {
+ ITextComponent component = MESSAGE_PREFIX.createCopy();
+ component.getStyle().setColor(TextFormatting.GRAY);
+ component.appendSibling(new TextComponentString(" " + message));
+ Minecraft.getMinecraft().addScheduledTask(() -> Baritone.settings().logger.get().accept(component));
+ }
+}
diff --git a/src/main/java/baritone/utils/InputOverrideHandler.java b/src/main/java/baritone/utils/InputOverrideHandler.java
index 72845ae8..3a32a18c 100755
--- a/src/main/java/baritone/utils/InputOverrideHandler.java
+++ b/src/main/java/baritone/utils/InputOverrideHandler.java
@@ -1,140 +1,118 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone. If not, see .
- */
-
-package baritone.utils;
-
-import baritone.Baritone;
-import baritone.api.BaritoneAPI;
-import baritone.api.event.events.TickEvent;
-import baritone.api.utils.IInputOverrideHandler;
-import baritone.api.utils.input.Input;
-import baritone.behavior.Behavior;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.util.MovementInputFromOptions;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * An interface with the game's control system allowing the ability to
- * force down certain controls, having the same effect as if we were actually
- * physically forcing down the assigned key.
- *
- * @author Brady
- * @since 7/31/2018
- */
-public final class InputOverrideHandler extends Behavior implements IInputOverrideHandler {
-
- /**
- * Maps inputs to whether or not we are forcing their state down.
- */
- private final Map inputForceStateMap = new HashMap<>();
-
- private final BlockBreakHelper blockBreakHelper;
-
- public InputOverrideHandler(Baritone baritone) {
- super(baritone);
- this.blockBreakHelper = new BlockBreakHelper(baritone.getPlayerContext());
- }
-
- /**
- * Returns whether or not we are forcing down the specified {@link KeyBinding}.
- *
- * @param key The KeyBinding object
- * @return Whether or not it is being forced down
- */
- @Override
- public final Boolean isInputForcedDown(KeyBinding key) {
- Input input = Input.getInputForBind(key);
- if (input == null) {
- return null;
- }
- if (input == Input.CLICK_LEFT && inControl()) {
- // only override left click off when pathing
- return false;
- }
- if (input == Input.CLICK_RIGHT) {
- if (isInputForcedDown(Input.CLICK_RIGHT)) {
- // gettoblock and builder can right click even when not pathing; allow them to do so
- return true;
- } else if (inControl()) {
- // but when we are pathing for real, force right click off
- return false;
- }
- }
- return null; // dont force any inputs other than left and right click
- }
-
- /**
- * Returns whether or not we are forcing down the specified {@link Input}.
- *
- * @param input The input
- * @return Whether or not it is being forced down
- */
- @Override
- public final boolean isInputForcedDown(Input input) {
- return input == null ? false : this.inputForceStateMap.getOrDefault(input, false);
- }
-
- /**
- * Sets whether or not the specified {@link Input} is being forced down.
- *
- * @param input The {@link Input}
- * @param forced Whether or not the state is being forced
- */
- @Override
- public final void setInputForceState(Input input, boolean forced) {
- this.inputForceStateMap.put(input, forced);
- }
-
- /**
- * Clears the override state for all keys
- */
- @Override
- public final void clearAllKeys() {
- this.inputForceStateMap.clear();
- }
-
- @Override
- public final void onTick(TickEvent event) {
- if (event.getType() == TickEvent.Type.OUT) {
- return;
- }
- blockBreakHelper.tick(isInputForcedDown(Input.CLICK_LEFT));
-
- if (inControl()) {
- if (ctx.player().movementInput.getClass() != PlayerMovementInput.class) {
- ctx.player().movementInput = new PlayerMovementInput(this);
- }
- } else {
- if (ctx.player().movementInput.getClass() == PlayerMovementInput.class) { // allow other movement inputs that aren't this one, e.g. for a freecam
- ctx.player().movementInput = new MovementInputFromOptions(Minecraft.getMinecraft().gameSettings);
- }
- }
- // only set it if it was previously incorrect
- // gotta do it this way, or else it constantly thinks you're beginning a double tap W sprint lol
- }
-
- private boolean inControl() {
- return baritone.getPathingBehavior().isPathing() || baritone.getBuilderProcess().isActive() || baritone != BaritoneAPI.getProvider().getPrimaryBaritone();
- }
-
- public BlockBreakHelper getBlockBreakHelper() {
- return blockBreakHelper;
- }
-}
+/*
+ * This file is part of Baritone.
+ *
+ * Baritone is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Baritone is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Baritone. If not, see .
+ */
+
+package baritone.utils;
+
+import baritone.Baritone;
+import baritone.api.BaritoneAPI;
+import baritone.api.event.events.TickEvent;
+import baritone.api.utils.IInputOverrideHandler;
+import baritone.api.utils.input.Input;
+import baritone.behavior.Behavior;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.MovementInputFromOptions;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * An interface with the game's control system allowing the ability to
+ * force down certain controls, having the same effect as if we were actually
+ * physically forcing down the assigned key.
+ *
+ * @author Brady
+ * @since 7/31/2018
+ */
+public final class InputOverrideHandler extends Behavior implements IInputOverrideHandler {
+
+ /**
+ * Maps inputs to whether or not we are forcing their state down.
+ */
+ private final Map inputForceStateMap = new HashMap<>();
+
+ private final BlockBreakHelper blockBreakHelper;
+ private final BlockPlaceHelper blockPlaceHelper;
+
+ public InputOverrideHandler(Baritone baritone) {
+ super(baritone);
+ this.blockBreakHelper = new BlockBreakHelper(baritone.getPlayerContext());
+ this.blockPlaceHelper = new BlockPlaceHelper(baritone.getPlayerContext());
+ }
+
+ /**
+ * Returns whether or not we are forcing down the specified {@link Input}.
+ *
+ * @param input The input
+ * @return Whether or not it is being forced down
+ */
+ @Override
+ public final boolean isInputForcedDown(Input input) {
+ return input == null ? false : this.inputForceStateMap.getOrDefault(input, false);
+ }
+
+ /**
+ * Sets whether or not the specified {@link Input} is being forced down.
+ *
+ * @param input The {@link Input}
+ * @param forced Whether or not the state is being forced
+ */
+ @Override
+ public final void setInputForceState(Input input, boolean forced) {
+ this.inputForceStateMap.put(input, forced);
+ }
+
+ /**
+ * Clears the override state for all keys
+ */
+ @Override
+ public final void clearAllKeys() {
+ this.inputForceStateMap.clear();
+ }
+
+ @Override
+ public final void onTick(TickEvent event) {
+ if (event.getType() == TickEvent.Type.OUT) {
+ return;
+ }
+ if (isInputForcedDown(Input.CLICK_LEFT)) {
+ setInputForceState(Input.CLICK_RIGHT, false);
+ }
+ blockBreakHelper.tick(isInputForcedDown(Input.CLICK_LEFT));
+ blockPlaceHelper.tick(isInputForcedDown(Input.CLICK_RIGHT));
+
+ if (inControl()) {
+ if (ctx.player().movementInput.getClass() != PlayerMovementInput.class) {
+ ctx.player().movementInput = new PlayerMovementInput(this);
+ }
+ } else {
+ if (ctx.player().movementInput.getClass() == PlayerMovementInput.class) { // allow other movement inputs that aren't this one, e.g. for a freecam
+ ctx.player().movementInput = new MovementInputFromOptions(Minecraft.getMinecraft().gameSettings);
+ }
+ }
+ // only set it if it was previously incorrect
+ // gotta do it this way, or else it constantly thinks you're beginning a double tap W sprint lol
+ }
+
+ private boolean inControl() {
+ // if we are not primary (a bot) we should set the movementinput even when idle (not pathing)
+ return baritone.getPathingBehavior().isPathing() || baritone != BaritoneAPI.getProvider().getPrimaryBaritone();
+ }
+
+ public BlockBreakHelper getBlockBreakHelper() {
+ return blockBreakHelper;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/baritone/utils/PathRenderer.java b/src/main/java/baritone/utils/PathRenderer.java
index 06e298be..c0af870e 100644
--- a/src/main/java/baritone/utils/PathRenderer.java
+++ b/src/main/java/baritone/utils/PathRenderer.java
@@ -59,6 +59,9 @@ public final class PathRenderer implements Helper {
public static void render(RenderEvent event, PathingBehavior behavior) {
float partialTicks = event.getPartialTicks();
Goal goal = behavior.getGoal();
+ if (mc.currentScreen instanceof GuiClickMeme) {
+ ((GuiClickMeme) mc.currentScreen).onRender(partialTicks);
+ }
int thisPlayerDimension = behavior.baritone.getPlayerContext().world().provider.getDimensionType().getId();
int currentRenderViewDimension = BaritoneAPI.getProvider().getPrimaryBaritone().getPlayerContext().world().provider.getDimensionType().getId();
@@ -102,9 +105,9 @@ public final class PathRenderer implements Helper {
//long split = System.nanoTime();
if (current != null) {
- drawManySelectionBoxes(renderView, current.toBreak(), partialTicks, Baritone.settings().colorBlocksToBreak.get());
- drawManySelectionBoxes(renderView, current.toPlace(), partialTicks, Baritone.settings().colorBlocksToPlace.get());
- drawManySelectionBoxes(renderView, current.toWalkInto(), partialTicks, Baritone.settings().colorBlocksToWalkInto.get());
+ drawManySelectionBoxes(renderView, current.toBreak(), Baritone.settings().colorBlocksToBreak.get());
+ drawManySelectionBoxes(renderView, current.toPlace(), Baritone.settings().colorBlocksToPlace.get());
+ drawManySelectionBoxes(renderView, current.toWalkInto(), Baritone.settings().colorBlocksToWalkInto.get());
}
// If there is a path calculation currently running, render the path calculation process
@@ -115,7 +118,7 @@ public final class PathRenderer implements Helper {
currentlyRunning.pathToMostRecentNodeConsidered().ifPresent(mr -> {
drawPath(mr, 0, renderView, partialTicks, Baritone.settings().colorMostRecentConsidered.get(), Baritone.settings().fadePath.get(), 10, 20);
- drawManySelectionBoxes(renderView, Collections.singletonList(mr.getDest()), partialTicks, Baritone.settings().colorMostRecentConsidered.get());
+ drawManySelectionBoxes(renderView, Collections.singletonList(mr.getDest()), Baritone.settings().colorMostRecentConsidered.get());
});
});
//long end = System.nanoTime();
@@ -172,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, partialTicks);
+ drawLine(player, x1, y1, z1, x2, y2, z2);
tessellator.draw();
}
if (Baritone.settings().renderPathIgnoreDepth.get()) {
@@ -184,10 +187,10 @@ 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, float partialTicks) {
- double d0 = player.lastTickPosX + (player.posX - player.lastTickPosX) * (double) partialTicks;
- double d1 = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double) partialTicks;
- double d2 = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double) partialTicks;
+ public static void drawLine(Entity player, 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;
BUFFER.begin(GL_LINE_STRIP, DefaultVertexFormats.POSITION);
BUFFER.pos(bp1x + 0.5D - d0, bp1y + 0.5D - d1, bp1z + 0.5D - d2).endVertex();
BUFFER.pos(bp2x + 0.5D - d0, bp2y + 0.5D - d1, bp2z + 0.5D - d2).endVertex();
@@ -196,7 +199,7 @@ public final class PathRenderer implements Helper {
BUFFER.pos(bp1x + 0.5D - d0, bp1y + 0.5D - d1, bp1z + 0.5D - d2).endVertex();
}
- public static void drawManySelectionBoxes(Entity player, Collection positions, float partialTicks, Color color) {
+ public static void drawManySelectionBoxes(Entity player, Collection positions, Color color) {
GlStateManager.enableBlend();
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
GlStateManager.color(color.getColorComponents(null)[0], color.getColorComponents(null)[1], color.getColorComponents(null)[2], 0.4F);
@@ -210,10 +213,6 @@ public final class PathRenderer implements Helper {
float expand = 0.002F;
//BlockPos blockpos = movingObjectPositionIn.getBlockPos();
-
- double renderPosX = player.lastTickPosX + (player.posX - player.lastTickPosX) * (double) partialTicks;
- double renderPosY = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double) partialTicks;
- double renderPosZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double) partialTicks;
BlockStateInterface bsi = new BlockStateInterface(BaritoneAPI.getProvider().getPrimaryBaritone().getPlayerContext()); // TODO this assumes same dimension between primary baritone and render view? is this safe?
positions.forEach(pos -> {
IBlockState state = bsi.get0(pos);
@@ -223,7 +222,7 @@ public final class PathRenderer implements Helper {
} else {
toDraw = state.getSelectedBoundingBox(player.world, pos);
}
- toDraw = toDraw.expand(expand, expand, expand).offset(-renderPosX, -renderPosY, -renderPosZ);
+ toDraw = toDraw.expand(expand, expand, expand).offset(-mc.getRenderManager().viewerPosX, -mc.getRenderManager().viewerPosY, -mc.getRenderManager().viewerPosZ);
BUFFER.begin(GL_LINE_STRIP, DefaultVertexFormats.POSITION);
BUFFER.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
BUFFER.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
@@ -260,10 +259,9 @@ public final class PathRenderer implements Helper {
}
public static void drawDankLitGoalBox(Entity player, Goal goal, float partialTicks, Color color) {
- double renderPosX = player.lastTickPosX + (player.posX - player.lastTickPosX) * (double) partialTicks;
- double renderPosY = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double) partialTicks;
- double renderPosZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double) partialTicks;
-
+ double renderPosX = mc.getRenderManager().viewerPosX;
+ double renderPosY = mc.getRenderManager().viewerPosY;
+ double renderPosZ = mc.getRenderManager().viewerPosZ;
double minX;
double maxX;
double minZ;
diff --git a/src/main/java/baritone/utils/player/PrimaryPlayerContext.java b/src/main/java/baritone/utils/player/PrimaryPlayerContext.java
index 1eefc91f..20fe9836 100644
--- a/src/main/java/baritone/utils/player/PrimaryPlayerContext.java
+++ b/src/main/java/baritone/utils/player/PrimaryPlayerContext.java
@@ -21,6 +21,7 @@ import baritone.api.BaritoneAPI;
import baritone.api.cache.IWorldData;
import baritone.api.utils.IPlayerContext;
import baritone.api.utils.IPlayerController;
+import baritone.api.utils.RayTraceUtils;
import baritone.utils.Helper;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.util.math.RayTraceResult;
@@ -58,6 +59,6 @@ public enum PrimaryPlayerContext implements IPlayerContext, Helper {
@Override
public RayTraceResult objectMouseOver() {
- return mc.objectMouseOver;
+ return RayTraceUtils.rayTraceTowards(player(), playerRotations(), playerController().getBlockReachDistance());
}
}
diff --git a/src/main/java/baritone/utils/player/PrimaryPlayerController.java b/src/main/java/baritone/utils/player/PrimaryPlayerController.java
index c0dc8798..76e389e7 100644
--- a/src/main/java/baritone/utils/player/PrimaryPlayerController.java
+++ b/src/main/java/baritone/utils/player/PrimaryPlayerController.java
@@ -19,12 +19,18 @@ package baritone.utils.player;
import baritone.api.utils.IPlayerController;
import baritone.utils.Helper;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ClickType;
import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
import net.minecraft.world.GameType;
+import net.minecraft.world.World;
/**
* Implementation of {@link IPlayerController} that chains to the primary player controller's methods
@@ -60,4 +66,10 @@ public enum PrimaryPlayerController implements IPlayerController, Helper {
public GameType getGameType() {
return mc.playerController.getCurrentGameType();
}
+
+ @Override
+ public EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand) {
+ // primaryplayercontroller is always in a WorldClient so this is ok
+ return mc.playerController.processRightClickBlock(player, (WorldClient) world, pos, direction, vec, hand);
+ }
}