v1.8.3

Merge pull request #3292 from wagyourtail/1.18.2
1.18.2
2022-03-08 14:50:04 -08:00 · 2022-03-08 14:47:42 -08:00 · 2022-03-01 16:36:09 -07:00 · 2022-02-28 15:29:37 -07:00 · 2022-02-02 15:55:22 -08:00 · 2022-02-02 15:47:50 -08:00
221 changed files with 4347 additions and 4040 deletions
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -11,7 +11,7 @@ Operating system:
 Java version:
 Minecraft version:
 Baritone version:
-Forge mods (if used): 
+Other mods (if used): 

 ## Exception, error or logs
 Please find your `latest.log` or `debug.log` in this folder and attach it to the issue
--- a/.github/workflows/gradle_build.yml
+++ b/.github/workflows/gradle_build.yml
@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'adopt'
+        
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+      
+    - name: Build with Gradle
+      run: ./gradlew build
+
+    - name: Build (fabric) with Gradle
+      run: ./gradlew build -Pbaritone.fabric_build
+
+    - name: Build (forge) with Gradle
+      run: ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge
+      
+    - name: Archive Artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: Artifacts
+        path: dist/
+        
+    - name: Archive mapping.txt
+      uses: actions/upload-artifact@v2
+      with:
+        name: Mappings
+        path: build/tmp/proguard/mapping.txt
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -0,0 +1,26 @@
+
+name: Tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'adopt'
+        
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+      
+    - name: Executing tests
+      run: ./gradlew test
+    
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 run/
 autotest/
 dist/
+volderyarn/

 # Gradle
 build/
@@ -20,6 +21,14 @@ classes/
 *.iws
 /logs/

+# Eclipse Files
+.classpath
+.project
+.settings/
+baritone_Client.launch
+
 # Copyright Files
 !/.idea/copyright/Baritone.xml
 !/.idea/copyright/profiles_settings.xml
+
+.vscode/launch.json
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,14 @@
+image: java:8
+
+before_script:
+  - which java
+  - which javac
+
+build:
+  script:
+    - ./gradlew build
+    - ./gradlew build -Pbaritone.forge_build
+  artifacts:
+    paths:
+      - dist/*
+    expire_in: 1 week
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +0,0 @@
-language: java
-
-sudo: required
-
-services:
- docker
-
-install:
- travis_retry docker build -t cabaletta/baritone .
-
-script:
- docker run --name baritone cabaletta/baritone ./gradlew javadoc
- docker cp baritone:/code/dist dist
- ls dist
- cat dist/checksums.txt
-
-deploy:
-  provider: releases
-  api_key:
-    secure: YOuiXoJNpB4bW89TQoY2IGXg0tqOKls55YMXsSPU6Mx8WzRu8CjjO/A8KA9nGfNrKM+NucjiKr/h53O2Dp2uyy0i0SLvav/G0MaBMeB1NlPRwFopi6tVPNaoZsvr8NW4BIURhspckYLpOTYWnfmOkIv8q7AxrjUZWPKDlq0dte20UxEqUE6msHJ7U9XlKo/4fX40kvWMfwGI2hTyAtL0cRT1QPsd+uW3OQjAPcQj+jKaWld46V8pBK8g9Qde9mo8HC9NBv97zw1bBF1EFkynW569kElHvaS2Opl2QLGaf66guDbpnqDpGHMhQrDdxsZHJ4RksyITn+8A9UArmbkU35BxKqBeQqOWxod2+M0axdLh1pvX43Q1t9n7RiZBf7GvV8vkXL5Sjf8v6Y4LqkJGhvQkTUwpH+0knwrE761DMCtBC34AiWG70D4u7msmhurkflr9kmRHSj/3lyJ1Q2lkt8L+FOAlQBVs64vXTsfgc6Yge7N0O3UD5hCkrDNoz3BzhNBdCkbdxdKCGip71UZgUNkPy9o3ui8jATNj9ypx3+U8ovqP0XWlJqUZmyeXyNGW9NrLeCkRLTlLnZ/dv6OPONa1oAu4TwF1w5A+TGRFZcZjH/PnZKZDQ1OYQOR6drLKRYdr2unvuf5KUKUGqZ7aYtLGhP0rBvGWddRV7DSmX/s=
-  all_branches: true
-  file_glob: true
-  file:
-  - dist/*
-  skip_cleanup: true
-  on:
-    tags: true
-    repo: cabaletta/baritone
--- a/6
+++ b/6
@@ -1,11 +1,11 @@
-FROM debian:stretch
+FROM ubuntu:focal

 ENV DEBIAN_FRONTEND noninteractive

 RUN apt update -y

 RUN apt install \
-          openjdk-8-jdk \
+          openjdk-17-jdk \
          --assume-yes

 COPY . /code
@@ -13,3 +13,5 @@ COPY . /code
 WORKDIR /code

 RUN ./gradlew build
+RUN ./gradlew build -Pbaritone.forge_build -Ploom.platform=forge
+RUN ./gradlew build -Pbaritone.fabric_build
--- a/README.md
+++ b/README.md
@@ -1,49 +1,69 @@
 # Baritone
-[![HitCount](http://hits.dwyl.com/cabaletta/baritone.svg)](http://hits.dwyl.com/cabaletta/baritone/)
-[![GitHub All Releases](https://img.shields.io/github/downloads/cabaletta/baritone/total.svg)](https://github.com/cabaletta/baritone/releases/)
+<p align="center">
+  <a href="https://github.com/cabaletta/baritone/releases/"><img src="https://img.shields.io/github/downloads/cabaletta/baritone/total.svg" alt="GitHub All Releases"/></a>
+</p>

-[![Build Status](https://travis-ci.com/cabaletta/baritone.svg?branch=master)](https://travis-ci.com/cabaletta/baritone/)
-[![Release](https://img.shields.io/github/release/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/releases/)
-[![License](https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg)](LICENSE)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400)](https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade)
-[![Minecraft](https://img.shields.io/badge/MC-1.12.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/master/)
-[![Minecraft](https://img.shields.io/badge/MC-1.13.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.13.2/)
-[![Minecraft](https://img.shields.io/badge/MC-1.14.4-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.14.4/)
-[![Minecraft](https://img.shields.io/badge/MC-1.15.2-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.15.2/)
-[![Minecraft](https://img.shields.io/badge/MC-1.16.4-brightgreen.svg)](https://github.com/cabaletta/baritone/tree/1.16.4/)
-[![Code of Conduct](https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat)](https://github.com/cabaletta/baritone/blob/master/CODE_OF_CONDUCT.md)
-[![Known Vulnerabilities](https://snyk.io/test/github/cabaletta/baritone/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle)
-[![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/cabaletta/baritone/issues/)
-[![Issues](https://img.shields.io/github/issues/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/issues/)
-[![GitHub issues-closed](https://img.shields.io/github/issues-closed/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/issues?q=is%3Aissue+is%3Aclosed)
-[![Pull Requests](https://img.shields.io/github/issues-pr/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/pulls/)
-![Code size](https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg)
-![GitHub repo size](https://img.shields.io/github/repo-size/cabaletta/baritone.svg)
-![Lines of Code](https://tokei.rs/b1/github/cabaletta/baritone?category=code)
-[![GitHub contributors](https://img.shields.io/github/contributors/cabaletta/baritone.svg)](https://github.com/cabaletta/baritone/graphs/contributors/)
-[![GitHub commits](https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg)](https://github.com/cabaletta/baritone/commit/)
-[![Impact integration](https://img.shields.io/badge/Impact%20integration-v1.2.14%20/%20v1.3.8%20/%20v1.4.6%20/%20v1.5.3-brightgreen.svg)](https://impactclient.net/)
-[![KAMI Blue integration](https://img.shields.io/badge/KAMI%20Blue%20integration-v1.2.14--master-green)](https://github.com/kami-blue/client)
-[![ForgeHax integration](https://img.shields.io/badge/ForgeHax%20%22integration%22-scuffed-yellow.svg)](https://github.com/fr1kin/ForgeHax/)
-[![Aristois add-on integration](https://img.shields.io/badge/Aristois%20add--on%20integration-v1.3.4%20/%20v1.4.1-green.svg)](https://gitlab.com/emc-mods-indrit/baritone_api)
-[![rootNET integration](https://img.shields.io/badge/rootNET%20integration-v1.2.14-green.svg)](https://rootnet.dev/)
-[![Future integration](https://img.shields.io/badge/Future%20integration-v1.2.12%20%2F%20v1.3.6%20%2F%20v1.4.4-red)](https://futureclient.net/)
-[![RusherHack integration](https://img.shields.io/badge/RusherHack%20integration-v1.2.14-green)](https://rusherhack.org/)
-[![forthebadge](https://forthebadge.com/images/badges/built-with-swag.svg)](http://forthebadge.com/)
-[![forthebadge](https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg)](http://forthebadge.com/)
+<p align="center">
+  <img src="https://img.shields.io/badge/MC-1.12.2-brightgreen.svg" alt="Minecraft"/>
+  <img src="https://img.shields.io/badge/MC-1.13.2-brightgreen.svg" alt="Minecraft"/>
+  <img src="https://img.shields.io/badge/MC-1.14.4-brightgreen.svg" alt="Minecraft"/>
+  <img src="https://img.shields.io/badge/MC-1.15.2-brightgreen.svg" alt="Minecraft"/>
+  <img src="https://img.shields.io/badge/MC-1.16.5-brightgreen.svg" alt="Minecraft"/>
+  <img src="https://img.shields.io/badge/MC-1.17.1-brightgreen.svg" alt="Minecraft"/>
+  <img src="https://img.shields.io/badge/MC-1.18.1-brightgreen.svg" alt="Minecraft"/>
+</p>

-A Minecraft pathfinder bot. 
+<p align="center">
+  <a href="https://travis-ci.com/cabaletta/baritone/"><img src="https://travis-ci.com/cabaletta/baritone.svg?branch=master" alt="Build Status"/></a>
+  <a href="https://github.com/cabaletta/baritone/releases/"><img src="https://img.shields.io/github/release/cabaletta/baritone.svg" alt="Release"/></a>
+  <a href="LICENSE"><img src="https://img.shields.io/badge/license-LGPL--3.0%20with%20anime%20exception-green.svg" alt="License"/></a>
+  <a href="https://www.codacy.com/app/leijurv/baritone?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=cabaletta/baritone&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/a73d037823b64a5faf597a18d71e3400" alt="Codacy Badge"/></a>
+  <a href="https://github.com/cabaletta/baritone/blob/master/CODE_OF_CONDUCT.md"><img src="https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg?style=flat" alt="Code of Conduct"/></a>
+  <a href="https://snyk.io/test/github/cabaletta/baritone?targetFile=build.gradle"><img src="https://snyk.io/test/github/cabaletta/baritone/badge.svg?targetFile=build.gradle" alt="Known Vulnerabilities"/></a>
+  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat" alt="Contributions welcome"/></a>
+  <a href="https://github.com/cabaletta/baritone/issues/"><img src="https://img.shields.io/github/issues/cabaletta/baritone.svg" alt="Issues"/></a>
+  <a href="https://github.com/cabaletta/baritone/issues?q=is%3Aissue+is%3Aclosed"><img src="https://img.shields.io/github/issues-closed/cabaletta/baritone.svg" alt="GitHub issues-closed"/></a>
+  <a href="https://github.com/cabaletta/baritone/pulls/"><img src="https://img.shields.io/github/issues-pr/cabaletta/baritone.svg" alt="Pull Requests"/></a>
+  <a href="https://github.com/cabaletta/baritone/graphs/contributors/"><img src="https://img.shields.io/github/contributors/cabaletta/baritone.svg" alt="GitHub contributors"/></a>
+  <a href="https://github.com/cabaletta/baritone/commit/"><img src="https://img.shields.io/github/commits-since/cabaletta/baritone/v1.0.0.svg" alt="GitHub commits"/></a>
+  <img src="https://img.shields.io/github/languages/code-size/cabaletta/baritone.svg" alt="Code size"/>
+  <img src="https://img.shields.io/github/repo-size/cabaletta/baritone.svg" alt="GitHub repo size"/>
+  <img src="https://tokei.rs/b1/github/cabaletta/baritone?category=code" alt="Lines of Code"/>
+</p>
+
+<p align="center">
+  <a href="https://impactclient.net/"><img src="https://img.shields.io/badge/Impact%20integration-v1.2.14%20/%20v1.3.8%20/%20v1.4.6%20/%20v1.5.3%20/%20v1.6.3-brightgreen.svg" alt="Impact integration"/></a>
+  <a href="https://github.com/kami-blue/client"><img src="https://img.shields.io/badge/KAMI%20Blue%20integration-v1.2.14--master-green" alt="KAMI Blue integration"/></a>
+  <a href="https://github.com/fr1kin/ForgeHax/"><img src="https://img.shields.io/badge/ForgeHax%20%22integration%22-scuffed-yellow.svg" alt="ForgeHax integration"/></a>
+  <a href="https://aristois.net/"><img src="https://img.shields.io/badge/Aristois%20add--on%20integration-v1.6.3-green.svg" alt="Aristois add-on integration"/></a>
+  <a href="https://rootnet.dev/"><img src="https://img.shields.io/badge/rootNET%20integration-v1.2.14-green.svg" alt="rootNET integration"/></a>
+  <a href="https://futureclient.net/"><img src="https://img.shields.io/badge/Future%20integration-v1.2.12%20%2F%20v1.3.6%20%2F%20v1.4.4-red" alt="Future integration"/></a>
+  <a href="https://rusherhack.org/"><img src="https://img.shields.io/badge/RusherHack%20integration-v1.2.14-green" alt="RusherHack integration"/></a>
+</p>
+
+<p align="center">
+  <a href="http://forthebadge.com/"><img src="https://forthebadge.com/images/badges/built-with-swag.svg" alt="forthebadge"/></a>
+  <a href="http://forthebadge.com/"><img src="https://forthebadge.com/images/badges/mom-made-pizza-rolls.svg" alt="forthebadge"/></a>
+</p>
+
+A Minecraft pathfinder bot.
+
+[**Baritone Discord Server**](http://discord.gg/s6fRBAUpmr)

 Baritone is the pathfinding system used in [Impact](https://impactclient.net/) since 4.4. There's a [showcase video](https://youtu.be/CZkLXWo4Fg4) made by @Adovin#0730 on Baritone which I recommend. [Here's](https://www.youtube.com/watch?v=StquF69-_wI) a (very old!) video I made showing off what it can do. [Tutorial playlist](https://www.youtube.com/playlist?list=PLnwnJ1qsS7CoQl9Si-RTluuzCo_4Oulpa)

-The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the v1.2.* `api-forge` jar from [releases](https://github.com/cabaletta/baritone/releases). **For 1.12.2 Forge, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.2.14/baritone-api-forge-1.2.14.jar)**. Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.
+The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone. The second easiest way (for 1.12.2 only) is to install the v1.2.* `api-forge` jar from [releases](https://github.com/cabaletta/baritone/releases). **For 1.12.2 Forge, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.2.15/baritone-api-forge-1.2.15.jar)**. Otherwise, see [Installation & setup](SETUP.md). Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.

 For 1.15.2, [click here](https://www.youtube.com/watch?v=j1qKtCZFURM) and see description. If you need Forge 1.15.2, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.5.3), follow the instructions, and get the `api-forge` jar.

-For 1.16.4, [click here](https://www.youtube.com/watch?v=_4eVJ9Qz2J8) and see description. If you need Forge 1.16.4, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.6.2) and get the `api-forge` jar.
+For 1.16.5, [click here](https://www.youtube.com/watch?v=_4eVJ9Qz2J8) and see description. If you need Forge or Fabric 1.16.5, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.6.3) and get the `api-forge` or `api-fabric` jar. **For 1.16.5 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.6.3/baritone-api-fabric-1.6.3.jar)**.
+
+If you need Forge or Fabric 1.17.1, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.7.1) and get the `api-forge` or `api-fabric` jar. **For 1.17.1 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.7.1/baritone-api-fabric-1.7.1.jar)**.
+
+If you need Forge or Fabric 1.18.1, look [here](https://github.com/cabaletta/baritone/releases/tag/v1.8.1) and get the `api-forge` or `api-fabric` jar. **For 1.18.1 Fabric, just click [here](https://github.com/cabaletta/baritone/releases/download/v1.8.1/baritone-api-fabric-1.8.1.jar)**.

 This project is an updated version of [MineBot](https://github.com/leijurv/MineBot/),
-the original version of the bot for Minecraft 1.8.9, rebuilt for 1.12.2 through 1.16.4. Baritone focuses on reliability and particularly performance (it's over [30x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).
+the original version of the bot for Minecraft 1.8.9, rebuilt for 1.12.2 onwards. Baritone focuses on reliability and particularly performance (it's over [30x faster](https://github.com/cabaletta/baritone/pull/180#issuecomment-423822928) than MineBot at calculating paths).

 Have committed at least once a day from Aug 1, 2018, to Aug 1, 2019.

--- a/SETUP.md
+++ b/SETUP.md
@@ -2,7 +2,7 @@

 The easiest way to install Baritone is to install [Impact](https://impactclient.net/), which comes with Baritone.

-You can also use a custom version json for Minecraft, with the [1.14.4](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1) version or the [1.15.2](https://www.dropbox.com/s/8rx6f0kts9hvd4f/1.15.2-Baritone.zip?dl=1) version
+You can also use a custom version json for Minecraft, with the [1.14.4](https://www.dropbox.com/s/rkml3hjokd3qv0m/1.14.4-Baritone.zip?dl=1) version or the [1.15.2](https://www.dropbox.com/s/8rx6f0kts9hvd4f/1.15.2-Baritone.zip?dl=1) version or the [1.16.5](https://www.dropbox.com/s/i6f292o2i7o9acp/1.16.5-Baritone.zip?dl=1) version.

 Once Baritone is installed, look [here](USAGE.md) for instructions on how to use it.

@@ -11,9 +11,9 @@ These releases are not always completely up to date with latest features, and ar

 Link to the releases page: [Releases](https://github.com/cabaletta/baritone/releases)

-v1.2.* is for 1.12.2, v1.3.* is for 1.13.2
+v1.2.* is for 1.12.2, v1.3.* is for 1.13.2, v1.4.* is for 1.14.4, v1.5.* is for 1.15.2, v1.6.* is for 1.16.2 or 1.16.4 or 1.16.5 (LOL)

-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`. 
+Any official release will be GPG signed by leijurv (44A3EA646EADAC6A). Please verify that the hash of the file you download is in `checksums.txt` and that `checksums_signed.asc` is a valid signature by that public keys of `checksums.txt`. 

 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).

@@ -32,11 +32,6 @@ If another one of your Forge mods has a Baritone integration, you want `baritone
 - **Forge Standalone**: Same as Standalone, but packaged for Forge. This should be used when Baritone is your only Forge mod, or none of your other Forge mods integrate with Baritone.
 - **Unoptimized**: Nothing is obfuscated. This shouldn't be used ever in production.

-## More Info
-To replace out Impact 4.5's Baritone build with a customized one, build Baritone as above then copy & **rename** `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"`). **Restart your launcher** then load as normal. 
-
-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

--- a/USAGE.md
+++ b/USAGE.md
@@ -47,7 +47,7 @@ Some common examples:
 - `build` to build a schematic. `build blah.schematic` will load `schematics/blah.schematic` and build it with the origin being your player feet. `build blah.schematic x y z` to set the origin. Any of those can be relative to your player (`~ 69 ~-420` would build at x=player x, y=69, z=player z-420).
 - `schematica` to build the schematic that is currently open in schematica
 - `tunnel` to dig and make a tunnel, 1x2. It will only deviate from the straight line if necessary such as to avoid lava. For a dumber tunnel that is really just cleararea, you can `tunnel 3 2 100`, to clear an area 3 high, 2 wide, and 100 deep.
- `farm` to automatically harvest, replant, or bone meal crops
+- `farm` to automatically harvest, replant, or bone meal crops. Use `farm <range>` or `farm <range> <waypoint>` to limit the max distance from the starting point or a waypoint. 
 - `axis` to go to an axis or diagonal axis at y=120 (`axisHeight` is a configurable setting, defaults to 120).
 - `explore x z` to explore the world from the origin of x,z. Leave out x and z to default to player feet. This will continually path towards the closest chunk to the origin that it's never seen before. `explorefilter filter.json` with optional invert can be used to load in a list of chunks to load.
 - `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.
--- a/build.gradle
+++ b/build.gradle
@@ -15,39 +15,25 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-group 'baritone'
-version '1.3.8'
-
-buildscript {
-    repositories {
-        maven {
-            name = 'forge'
-            url = 'http://files.minecraftforge.net/maven'
-        }
-        maven {
-            name = 'impactdevelopment-repo'
-            url = 'https://impactdevelopment.github.io/maven/'
-        }
-        jcenter()
-    }
-
-    dependencies {
-        classpath group: 'com.github.ImpactDevelopment', name: 'ForgeGradle', version: '3.0.115'
-        classpath group: 'com.github.ImpactDevelopment', name: 'MixinGradle', version: '0.6.2'
-    }
+plugins {
+    id 'java'
+    id 'dev.architectury.loom' version '0.10.0-SNAPSHOT'
+    id 'maven-publish'
 }

+
+archivesBaseName  = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
+
 import baritone.gradle.task.CreateDistTask
 import baritone.gradle.task.ProguardTask
-import org.apache.tools.ant.taskdefs.condition.Os

-apply plugin: 'java'
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.spongepowered.mixin'
+def compileType = project.hasProperty("baritone.fabric_build") ? "FABRIC" : project.hasProperty("baritone.forge_build") ? "FORGE" : "OFFICIAL"
+
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17

-sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
    options.encoding = "UTF-8" // allow emoji in comments :^)
 }

@@ -66,102 +52,67 @@ sourceSets {
        compileClasspath += main.compileClasspath + main.runtimeClasspath + main.output
        runtimeClasspath += main.compileClasspath + main.runtimeClasspath + main.output
    }
-
    schematica_api {
        compileClasspath += main.compileClasspath
    }
-
    main {
        compileClasspath += schematica_api.output
    }
 }

-task sourceJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.api.allSource
-}
-
-minecraft {
-    mappings channel: 'snapshot', version: '20190307-1.13.1'
-    reobfMappings 'notch'
+loom {
+    if (compileType.equals("FORGE")) {
+        forge {
+            mixinConfig 'mixins.baritone.json'
+        }
+    }
+    mixin.defaultRefmapName = "mixins.baritone.refmap.json"

    runs {
        client {
-            workingDirectory project.file('run')
-            source sourceSets.launch
-
-            main 'baritone.launch.LaunchTesting'
-
-            environment 'assetIndex', '{asset_index}'
-            environment 'assetDirectory', downloadAssets.output
-            environment 'nativesDirectory', extractNatives.output
-
-            environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
-
-            if (Os.isFamily(Os.FAMILY_MAC)) {
-                jvmArgs "-XstartOnFirstThread"
-            }
-        }
-
-        autoTest {
-            workingDirectory project.file('autotest')
-            source sourceSets.launch
-
-            main 'baritone.launch.LaunchTesting'
-
-            environment 'assetIndex', '{asset_index}'
-            environment 'assetDirectory', downloadAssets.output
-            environment 'nativesDirectory', extractNatives.output
-
-            environment 'tweakClass', 'baritone.launch.BaritoneTweaker'
-            environment 'BARITONE_AUTO_TEST', 'true'
-
-            if (Os.isFamily(Os.FAMILY_MAC)) {
-                jvmArgs "-XstartOnFirstThread"
-            }
+            source = sourceSets.launch
        }
    }
 }

+
 repositories {
-    mavenCentral()
-
-    maven {
-        name = 'SpongePowered'
-        url = 'https://repo.spongepowered.org/repository/maven-public/'
-    }
-
    maven {
        name = 'impactdevelopment-repo'
        url = 'https://impactdevelopment.github.io/maven/'
    }
+    maven {
+        name = "ldtteam"
+        url = "https://maven.parchmentmc.net/"
+    }
+    mavenCentral()
 }

 dependencies {
-    minecraft 'com.github.ImpactDevelopment:Vanilla:1.13.2'
-
-    runtime launchCompile('net.minecraft:launchwrapper:1.12') {
+    if (compileType.equals("FORGE")) {
+        forge "net.minecraftforge:forge:${project.forge_version}"
+    }
+    mappings loom.layered() {
+        officialMojangMappings()
+        //technically optional, but really helpful in dev:
+//        parchment("org.parchmentmc.data:parchment-1.17.1:2021.10.24@zip" as String)
+    }
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    if (!compileType.equals("FORGE")) {
+        modImplementation "net.fabricmc:fabric-loader:${project.fabric_version}"
+    }
+    // this makes it compile with the forge tweak stuff
+    implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2'
+    implementation('net.minecraft:launchwrapper:1.12') {
        exclude module: 'lwjgl'
+        exclude module: 'asm-debug-all'
    }
-    runtime launchCompile('org.ow2.asm:asm-debug-all:5.2')
-    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'
-    }
+
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'

    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
@@ -170,6 +121,24 @@ javadoc {
    classpath += sourceSets.api.compileClasspath
 }

+// skidded from fabric-example-mod (comments and all)
+tasks.withType(JavaCompile).configureEach {
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // If Javadoc is generated, this must be specified in that task too.
+    it.options.encoding = "UTF-8"
+
+    // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+    // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+    // We'll use that if it's available, but otherwise we'll use the older option.
+    def targetVersion = 16
+    if (JavaVersion.current().isJava9Compatible()) {
+        it.options.release = targetVersion
+    }
+}
+
+
 jar {
    from sourceSets.launch.output, sourceSets.api.output

@@ -181,21 +150,41 @@ jar {
    preserveFileTimestamps = false
    reproducibleFileOrder = true

+    if (getProject().hasProperty("baritone.fabric_build")) {
+        filesMatching("fabric.mod.json") {
+            expand "version": version
+        }
+    } else {
+        exclude("fabric.mod.json")
+    }
+
+
    manifest {
        attributes(
                'MixinConfigs': 'mixins.baritone.json',
+                "MixinConnector": "baritone.launch.BaritoneMixinConnector",

                'Implementation-Title': 'Baritone',
-                'Implementation-Version': version
+                'Implementation-Version': version,
        )
    }
 }

+if (compileType.equals("OFFICIAL")) {
+    remapJar {
+        toM.set "official"
+    }
+}
+
+
+
 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'
+    url 'https://github.com/Guardsquare/proguard/releases/download/v7.2.0-beta2/proguard-7.2.0-beta2.zip'
+    extract 'proguard-7.2.0-beta2/lib/proguard.jar'
+    compType compileType
 }

 task createDist(type: CreateDistTask, dependsOn: proguard)

-build.finalizedBy(createDist)
+
+build.finalizedBy(createDist)
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -20,6 +20,6 @@ repositories {
 }

 dependencies {
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    compile group: 'commons-io', name: 'commons-io', version: '2.6'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.6'
 }
--- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java
@@ -20,6 +20,7 @@ package baritone.gradle.task;
 import org.gradle.api.DefaultTask;

 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -40,31 +41,53 @@ class BaritoneGradleTask extends DefaultTask {
            PROGUARD_STANDALONE_CONFIG      = "standalone.pro",
            PROGUARD_EXPORT_PATH            = "proguard_out.jar",

-            ARTIFACT_STANDARD         = "%s-%s.jar",
-            ARTIFACT_UNOPTIMIZED      = "%s-unoptimized-%s.jar",
-            ARTIFACT_API              = "%s-api-%s.jar",
-            ARTIFACT_STANDALONE       = "%s-standalone-%s.jar";
+            ARTIFACT_STANDARD           = "%s-%s.jar",
+            ARTIFACT_UNOPTIMIZED        = "%s-unoptimized-%s.jar",
+            ARTIFACT_API                = "%s-api-%s.jar",
+            ARTIFACT_STANDALONE         = "%s-standalone-%s.jar",
+            ARTIFACT_FORGE_UNOPTIMIZED  = "%s-unoptimized-forge-%s.jar",
+            ARTIFACT_FORGE_API          = "%s-api-forge-%s.jar",
+            ARTIFACT_FORGE_STANDALONE   = "%s-standalone-forge-%s.jar",
+            ARTIFACT_FABRIC_UNOPTIMIZED = "%s-unoptimized-fabric-%s.jar",
+            ARTIFACT_FABRIC_API         = "%s-api-fabric-%s.jar",
+            ARTIFACT_FABRIC_STANDALONE  = "%s-standalone-fabric-%s.jar";

    protected String artifactName, artifactVersion;
-    protected Path artifactPath, artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, proguardOut;
+    protected final Path
+        artifactPath,
+        artifactUnoptimizedPath, artifactApiPath, artifactStandalonePath, // these are different for forge builds
+        proguardOut;

-    protected void verifyArtifacts() throws IllegalStateException {
+    public BaritoneGradleTask() {
        this.artifactName = getProject().getName();
        this.artifactVersion = getProject().getVersion().toString();

-        this.artifactPath                = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
-        this.artifactUnoptimizedPath     = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
-        this.artifactApiPath             = this.getBuildFile(formatVersion(ARTIFACT_API));
-        this.artifactStandalonePath      = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
+        this.artifactPath = this.getBuildFile(formatVersion(ARTIFACT_STANDARD));
+
+        if (getProject().hasProperty("baritone.forge_build")) {
+            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FORGE_UNOPTIMIZED));
+            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FORGE_API));
+            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FORGE_STANDALONE));
+        } else if (getProject().hasProperty("baritone.fabric_build")) {
+            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED));
+            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_API));
+            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_FABRIC_STANDALONE));
+        } else {
+            this.artifactUnoptimizedPath = this.getBuildFile(formatVersion(ARTIFACT_UNOPTIMIZED));
+            this.artifactApiPath         = this.getBuildFile(formatVersion(ARTIFACT_API));
+            this.artifactStandalonePath  = this.getBuildFile(formatVersion(ARTIFACT_STANDALONE));
+        }

        this.proguardOut = this.getTemporaryFile(PROGUARD_EXPORT_PATH);
+    }

+    protected void verifyArtifacts() throws IllegalStateException {
        if (!Files.exists(this.artifactPath)) {
            throw new IllegalStateException("Artifact not found! Run build first!");
        }
    }

-    protected void write(InputStream stream, Path file) throws Exception {
+    protected void write(InputStream stream, Path file) throws IOException {
        if (Files.exists(file)) {
            Files.delete(file);
        }
@@ -76,7 +99,7 @@ class BaritoneGradleTask extends DefaultTask {
    }

    protected Path getRelativeFile(String file) {
-        return Paths.get(new File(file).getAbsolutePath());
+        return Paths.get(new File(new File(getProject().getBuildDir(), "../"), file).getAbsolutePath());
    }

    protected Path getTemporaryFile(String file) {
--- a/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/CreateDistTask.java
@@ -19,13 +19,13 @@ package baritone.gradle.task;

 import org.gradle.api.tasks.TaskAction;

-import javax.xml.bind.DatatypeConverter;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.MessageDigest;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;

 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;

@@ -42,9 +42,9 @@ public class CreateDistTask extends BaritoneGradleTask {
        super.verifyArtifacts();

        // Define the distribution file paths
-        Path api             = getRelativeFile("dist/" + formatVersion(ARTIFACT_API));
-        Path standalone      = getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE));
-        Path unoptimized     = getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED));
+        Path api = getRelativeFile("dist/" + getFileName(artifactApiPath));
+        Path standalone = getRelativeFile("dist/" + getFileName(artifactStandalonePath));
+        Path unoptimized = getRelativeFile("dist/" + getFileName(artifactUnoptimizedPath));

        // NIO will not automatically create directories
        Path dir = getRelativeFile("dist/");
@@ -53,12 +53,14 @@ public class CreateDistTask extends BaritoneGradleTask {
        }

        // Copy build jars to dist/
-        Files.copy(this.artifactApiPath,             api,             REPLACE_EXISTING);
-        Files.copy(this.artifactStandalonePath,      standalone,      REPLACE_EXISTING);
-        Files.copy(this.artifactUnoptimizedPath,     unoptimized,     REPLACE_EXISTING);
+        // TODO: dont copy files that dont exist
+        Files.copy(this.artifactApiPath, api, REPLACE_EXISTING);
+        Files.copy(this.artifactStandalonePath, standalone, REPLACE_EXISTING);
+        Files.copy(this.artifactUnoptimizedPath, unoptimized, REPLACE_EXISTING);

        // Calculate all checksums and format them like "shasum"
-        List<String> shasum = Stream.of(api, standalone, unoptimized)
+        List<String> shasum = getAllDistJars().stream()
+                .filter(Files::exists)
                .map(path -> sha1(path) + "  " + path.getFileName().toString())
                .collect(Collectors.toList());

@@ -68,15 +70,45 @@ public class CreateDistTask extends BaritoneGradleTask {
        Files.write(getRelativeFile("dist/checksums.txt"), shasum);
    }

+    private static String getFileName(Path p) {
+        return p.getFileName().toString();
+    }
+
+    private List<Path> getAllDistJars() {
+        return Arrays.asList(
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_API)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_API)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_API)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_STANDALONE)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_STANDALONE)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_STANDALONE)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_UNOPTIMIZED)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FABRIC_UNOPTIMIZED)),
+                getRelativeFile("dist/" + formatVersion(ARTIFACT_FORGE_UNOPTIMIZED))
+        );
+    }
+
    private static synchronized String sha1(Path path) {
        try {
            if (SHA1_DIGEST == null) {
                SHA1_DIGEST = MessageDigest.getInstance("SHA-1");
            }
-            return DatatypeConverter.printHexBinary(SHA1_DIGEST.digest(Files.readAllBytes(path))).toLowerCase();
+            return bytesToHex(SHA1_DIGEST.digest(Files.readAllBytes(path))).toLowerCase();
        } catch (Exception e) {
            // haha no thanks
            throw new IllegalStateException(e);
        }
    }
+
+    private static final byte[] HEX_ARRAY = "0123456789ABCDEF".getBytes(StandardCharsets.US_ASCII);
+
+    public static String bytesToHex(byte[] bytes) {
+        byte[] hexChars = new byte[bytes.length * 2];
+        for (int j = 0; j < bytes.length; j++) {
+            int v = bytes[j] & 0xFF;
+            hexChars[j * 2] = HEX_ARRAY[v >>> 4];
+            hexChars[j * 2 + 1] = HEX_ARRAY[v & 0x0F];
+        }
+        return new String(hexChars, StandardCharsets.UTF_8);
+    }
 }
--- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
+++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java
@@ -22,21 +22,10 @@ import org.apache.commons.io.IOUtils;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.JavaVersion;
-import org.gradle.api.NamedDomainObjectContainer;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.internal.file.IdentityFileResolver;
-import org.gradle.api.internal.plugins.DefaultConvention;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.TaskCollection;
 import org.gradle.api.tasks.compile.ForkOptions;
 import org.gradle.api.tasks.compile.JavaCompile;
-import org.gradle.internal.Pair;
 import org.gradle.internal.jvm.Jvm;
-import org.gradle.internal.jvm.inspection.DefaultJvmVersionDetector;
-import org.gradle.process.internal.DefaultExecActionFactory;

 import java.io.*;
 import java.net.URL;
@@ -59,13 +48,33 @@ public class ProguardTask extends BaritoneGradleTask {
    @Input
    private String url;

+    public String getUrl() {
+        return url;
+    }
+
    @Input
    private String extract;

+    public String getExtract() {
+        return extract;
+    }
+
+    @Input
+    private String compType;
+
+    public String getCompType() {
+        return compType;
+    }
+
+    private final File copyMcTargetDir = new File("./build/createMcIntermediaryJar").getAbsoluteFile();
+    private final File copyMcTargetJar = new File(copyMcTargetDir, "client.jar");
+
    @TaskAction
    protected void exec() throws Exception {
        super.verifyArtifacts();

+        copyMcJar();
+
        // "Haha brady why don't you make separate tasks"
        processArtifact();
        downloadProguard();
@@ -76,6 +85,32 @@ public class ProguardTask extends BaritoneGradleTask {
        cleanup();
    }

+    private boolean isMcJar(File f) {
+        return f.getName().startsWith(compType.equals("FORGE") ? "forge-" : "minecraft-") && f.getName().contains("minecraft-mapped");
+    }
+
+    private void copyMcJar() throws IOException {
+        File mcClientJar = this.getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter(this::isMcJar)
+            .map(f -> {
+                switch (compType) {
+                    case "OFFICIAL":
+                        return new File(f.getParentFile().getParentFile(), "minecraft-merged.jar");
+                    case "FABRIC":
+                        return new File(f.getParentFile(), "minecraft-intermediary.jar");
+                    case "FORGE":
+                        return new File(f.getParentFile(), "minecraft-srg.jar");
+                }
+                return null;
+                })
+            .findFirst()
+            .get();
+        if (!mcClientJar.exists()) throw new IOException("Failed to find minecraft! " + mcClientJar.getAbsolutePath());
+        if (!copyMcTargetDir.exists() && !copyMcTargetDir.mkdirs()) throw new IOException("Failed to create target for copyMcJar");
+        Files.copy(mcClientJar.toPath(), copyMcTargetJar.toPath(), REPLACE_EXISTING);
+    }
+
    private void processArtifact() throws Exception {
        if (Files.exists(this.artifactUnoptimizedPath)) {
            Files.delete(this.artifactUnoptimizedPath);
@@ -184,15 +219,16 @@ public class ProguardTask extends BaritoneGradleTask {
    }

    private boolean validateJavaVersion(String java) {
-        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
-
-        if (!javaVersion.getMajorVersion().equals("8")) {
-            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
-            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
-            return false;
-        }
-
-        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+        //TODO: fix for j16
+//        final JavaVersion javaVersion = new DefaultJvmVersionDetector(new DefaultExecActionFactory(new IdentityFileResolver())).getJavaVersion(java);
+//
+//        if (!javaVersion.getMajorVersion().equals("8")) {
+//            System.out.println("Failed to validate Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
+//            // throw new RuntimeException("Java version incorrect: " + javaVersion.getMajorVersion() + " for " + java);
+//            return false;
+//        }
+//
+//        System.out.println("Validated Java version " + javaVersion.toString() + " [" + java + "] for ProGuard libraryjars");
        return true;
    }

@@ -204,23 +240,24 @@ public class ProguardTask extends BaritoneGradleTask {
        template.add(0, "-injars " + this.artifactPath.toString());
        template.add(1, "-outjars " + this.getTemporaryFile(PROGUARD_EXPORT_PATH));

-        // Acquire the RT jar using "java -verbose". This doesn't work on Java 9+
-        Process p = new ProcessBuilder(this.getJavaBinPathForProguard(), "-verbose").start();
-        String out = IOUtils.toString(p.getInputStream(), "UTF-8").split("\n")[0].split("Opened ")[1].replace("]", "");
-        template.add(2, "-libraryjars '" + out + "'");
+        template.add(2, "-libraryjars  <java.home>/jmods/java.base.jmod(!**.jar;!module-info.class)");
+        template.add(3, "-libraryjars  <java.home>/jmods/java.desktop.jmod(!**.jar;!module-info.class)");

-        // Discover all of the libraries that we will need to acquire from gradle
-        acquireDependencies().forEach(f -> {
-            if (f.toString().endsWith("-recomp.jar")) {
-                // remove MCP mapped jar
-                return;
+        {
+            final Stream<File> libraries;
+            {
+                // Discover all of the libraries that we will need to acquire from gradle
+                final Stream<File> dependencies = acquireDependencies()
+                    // remove MCP mapped jar, and nashorn
+                    .filter(f -> !f.toString().endsWith("-recomp.jar") && !f.getName().startsWith("nashorn") && !f.getName().startsWith("coremods"));
+
+                libraries = dependencies
+                    .map(f -> isMcJar(f) ? copyMcTargetJar : f);
            }
-            if (f.toString().endsWith("client-extra.jar")) {
-                // go from the extra to the original downloaded client
-                f = new File(f.getParentFile(), "client.jar");
-            }
-            template.add(2, "-libraryjars '" + f + "'");
-        });
+            libraries.forEach(f -> {
+                template.add(2, "-libraryjars '" + f + "'");
+            });
+        }

        // API config doesn't require any changes from the changes that we made to the template
        Files.write(getTemporaryFile(PROGUARD_API_CONFIG), template);
@@ -231,8 +268,14 @@ public class ProguardTask extends BaritoneGradleTask {
        Files.write(getTemporaryFile(PROGUARD_STANDALONE_CONFIG), standalone);
    }

+    private File getSrgMcJar() {
+        return getProject().getTasks().findByName("copyMcJar").getOutputs().getFiles().getSingleFile();
+    }
+
    private Stream<File> acquireDependencies() {
-        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles().stream().filter(File::isFile);
+        return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("launch").getRuntimeClasspath().getFiles()
+            .stream()
+            .filter(File::isFile);
    }

    private void proguardApi() throws Exception {
@@ -259,6 +302,10 @@ public class ProguardTask extends BaritoneGradleTask {
        this.extract = extract;
    }

+    public void setCompType(String compType) {
+        this.compType = compType;
+    }
+
    private void runProguard(Path config) throws Exception {
        // Delete the existing proguard output file. Proguard probably handles this already, but why not do it ourselves
        if (Files.exists(this.proguardOut)) {
--- a/gradle.properties
+++ b/gradle.properties
@@ -0,0 +1,13 @@
+org.gradle.jvmargs=-Xmx2048M
+
+mod_version=1.8.3
+maven_group=baritone
+archives_base_name=baritone
+
+minecraft_version=1.18.2
+forge_version=1.18.2-40.0.0
+fabric_version=0.13.1
+
+# # un comment for forge debugging default (as opposed to fabric)
+# baritone.forge_build=true
+# loom.platform=forge
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Jul 31 21:56:56 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
--- a/53
+++ b/53
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh

+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=$((i+1))
+        i=`expr $i + 1`
    done
    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

@@ -159,14 +177,9 @@ save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`

 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@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
+if "%ERRORLEVEL%" == "0" goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ 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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :end
@rem End local scope for the variables with windows NT shell
--- a/scripts/proguard.pro
+++ b/scripts/proguard.pro
@@ -16,7 +16,10 @@
 -dontwarn org.lwjgl.**
 # also lwjgl lol
 -dontwarn module-info
+# we dont have forge
+-dontwarn baritone.launch.BaritoneForgeModXD

+# please do not change the comment below
 -keep class baritone.api.** { *; } # this is the keep api

 # service provider needs these class names
@@ -334,3 +337,5 @@
    public java.lang.String substring(int);
    public java.lang.String substring(int,int);
 }
+
+-printmapping mapping.txt
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,5 +15,26 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-rootProject.name = 'baritone'
-
+pluginManagement {
+    repositories {
+        maven { url "https://maven.architectury.dev/" }
+        maven {
+            url = 'https://maven.fabricmc.net/'
+        }
+        maven {
+            name = 'forge'
+            url = 'https://files.minecraftforge.net/maven'
+        }
+        maven {
+            name = 'impactdevelopment-repo'
+            url = 'https://impactdevelopment.github.io/maven/'
+        }
+        maven {
+            url = 'https://www.dogforce-games.com/maven/'
+        }
+        maven {
+            url = 'https://libraries.minecraft.net/'
+        }
+        mavenCentral()
+    }
+}
--- a/src/api/java/baritone/api/BaritoneAPI.java
+++ b/src/api/java/baritone/api/BaritoneAPI.java
@@ -19,9 +19,6 @@ package baritone.api;

 import baritone.api.utils.SettingsUtil;

-import java.util.Iterator;
-import java.util.ServiceLoader;
-
 /**
 * Exposes the {@link IBaritoneProvider} instance and the {@link Settings} instance for API usage.
 *
@@ -37,9 +34,11 @@ public final class BaritoneAPI {
        settings = new Settings();
        SettingsUtil.readAndApply(settings);

-        ServiceLoader<IBaritoneProvider> baritoneLoader = ServiceLoader.load(IBaritoneProvider.class);
-        Iterator<IBaritoneProvider> instances = baritoneLoader.iterator();
-        provider = instances.next();
+        try {
+            provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance();
+        } catch (ReflectiveOperationException ex) {
+            throw new RuntimeException(ex);
+        }
    }

    public static IBaritoneProvider getProvider() {
--- a/src/api/java/baritone/api/IBaritoneProvider.java
+++ b/src/api/java/baritone/api/IBaritoneProvider.java
@@ -21,10 +21,9 @@ import baritone.api.cache.IWorldScanner;
 import baritone.api.command.ICommand;
 import baritone.api.command.ICommandSystem;
 import baritone.api.schematic.ISchematicSystem;
-import net.minecraft.client.entity.EntityPlayerSP;
-
 import java.util.List;
 import java.util.Objects;
+import net.minecraft.client.player.LocalPlayer;

 /**
 * Provides the present {@link IBaritone} instances, as well as non-baritone instance related APIs.
@@ -47,19 +46,19 @@ public interface IBaritoneProvider {
     * returned by {@link #getPrimaryBaritone()}.
     *
     * @return All active {@link IBaritone} instances.
-     * @see #getBaritoneForPlayer(EntityPlayerSP)
+     * @see #getBaritoneForPlayer(LocalPlayer)
     */
    List<IBaritone> getAllBaritones();

    /**
-     * Provides the {@link IBaritone} instance for a given {@link EntityPlayerSP}. This will likely be
+     * Provides the {@link IBaritone} instance for a given {@link LocalPlayer}. This will likely be
     * 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.
     */
-    default IBaritone getBaritoneForPlayer(EntityPlayerSP player) {
+    default IBaritone getBaritoneForPlayer(LocalPlayer player) {
        for (IBaritone baritone : getAllBaritones()) {
            if (Objects.equals(player, baritone.getPlayerContext().player())) {
                return baritone;
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -17,22 +17,26 @@

 package baritone.api;

+import baritone.api.utils.NotificationHelper;
 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.TypeUtils;
-import net.minecraft.block.Block;
+import baritone.api.utils.gui.BaritoneToast;
 import net.minecraft.client.Minecraft;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.util.math.Vec3i;
-import net.minecraft.util.text.ITextComponent;
-
+import net.minecraft.core.Vec3i;
+import net.minecraft.network.chat.BaseComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import java.awt.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.List;
 import java.util.*;
+import java.util.List;
 import java.util.function.Consumer;
+import java.util.function.BiConsumer;

 /**
 * Baritone's settings. Settings apply to all Baritone instances.
@@ -70,9 +74,9 @@ public final class Settings {
    public final Setting<Boolean> assumeExternalAutoTool = new Setting<>(false);

    /**
-     * If this setting is on, no auto tool will occur at all, not at calculation time nor execution time
+     * Automatically select the best available tool
     */
-    public final Setting<Boolean> disableAutoTool = new Setting<>(false);
+    public final Setting<Boolean> autoTool = new Setting<>(true);

    /**
     * It doesn't actually take twenty ticks to place a block, this cost is so high
@@ -187,15 +191,25 @@ public final class Settings {
    /**
     * Blocks that Baritone is not allowed to break
     */
+    public final Setting<List<Block>> blocksToDisallowBreaking = new Setting<>(new ArrayList<>(
+        // Leave Empty by Default
+    ));
+
+    /**
+     * blocks that baritone shouldn't break, but can if it needs to.
+     */
    public final Setting<List<Block>> blocksToAvoidBreaking = new Setting<>(new ArrayList<>(Arrays.asList( // TODO can this be a HashSet or ImmutableSet?
            Blocks.CRAFTING_TABLE,
            Blocks.FURNACE,
            Blocks.CHEST,
-            Blocks.TRAPPED_CHEST,
-            Blocks.SIGN,
-            Blocks.WALL_SIGN
+            Blocks.TRAPPED_CHEST
    )));

+    /**
+     * this multiplies the break speed, if set above 1 it's "encourage breaking" instead
+     */
+    public final Setting<Double> avoidBreakingMultiplier = new Setting<>(.1);
+
    /**
     * A list of blocks to be treated as if they're air.
     * <p>
@@ -205,6 +219,29 @@ public final class Settings {

    )));

+    /**
+     * A list of blocks to be treated as correct.
+     * <p>
+     * If a schematic asks for any block on this list at a certain position, it will be treated as correct, regardless of what it currently is.
+     */
+    public final Setting<List<Block>> buildSkipBlocks = new Setting<>(new ArrayList<>(Arrays.asList(
+
+    )));
+
+    /**
+     * A mapping of blocks to blocks treated as correct in their position
+     * <p>
+     * If a schematic asks for a block on this mapping, all blocks on the mapped list will be accepted at that location as well
+     */
+    public final Setting<Map<Block, List<Block>>> buildValidSubstitutes = new Setting<>(new HashMap<>());
+
+    /**
+     * A mapping of blocks to blocks to be built instead
+     * <p>
+     * If a schematic asks for a block on this mapping, Baritone will place the first placeable block in the mapped list
+     */
+    public final Setting<Map<Block, List<Block>>> buildSubstitutes = new Setting<>(new HashMap<>());
+
    /**
     * A list of blocks to become air
     * <p>
@@ -219,6 +256,11 @@ public final class Settings {
     */
    public final Setting<Boolean> buildIgnoreExisting = new Setting<>(false);

+    /**
+     * If this is true, the builder will ignore directionality of certain blocks like glazed terracotta.
+     */
+    public final Setting<Boolean> buildIgnoreDirection = new Setting<>(false);
+
    /**
     * If this setting is true, Baritone will never break a block that is adjacent to an unsupported falling block.
     * <p>
@@ -521,13 +563,6 @@ public final class Settings {
     */
    public final Setting<Boolean> pruneRegionsFromRAM = new Setting<>(true);

-    /**
-     * Remember the contents of containers (chests, echests, furnaces)
-     * <p>
-     * Really buggy since the packet stuff is multithreaded badly thanks to brady
-     */
-    public final Setting<Boolean> containerMemory = new Setting<>(false);
-
    /**
     * Fill in blocks behind you
     */
@@ -576,6 +611,12 @@ public final class Settings {
     */
    public final Setting<Boolean> renderGoal = new Setting<>(true);

+    /**
+     * Render the goal as a sick animated thingy instead of just a box
+     * (also controls animation of GoalXZ if {@link #renderGoalXZBeacon} is enabled)
+     */
+    public final Setting<Boolean> renderGoalAnimated = new Setting<>(true);
+
    /**
     * Render selection boxes
     */
@@ -645,7 +686,7 @@ public final class Settings {

    /**
     * When GetToBlockProcess or MineProcess fails to calculate a path, instead of just giving up, mark the closest instance
-     * of that block as "unreachable" and go towards the next closest. GetToBlock expands this seaarch to the whole "vein"; MineProcess does not.
+     * of that block as "unreachable" and go towards the next closest. GetToBlock expands this search to the whole "vein"; MineProcess does not.
     * This is because MineProcess finds individual impossible blocks (like one block in a vein that has gravel on top then lava, so it can't break)
     * Whereas GetToBlock should blacklist the whole "vein" if it can't get to any of them.
     */
@@ -700,6 +741,16 @@ public final class Settings {
     */
    public final Setting<Boolean> censorRanCommands = new Setting<>(false);

+    /**
+     * Stop using tools just before they are going to break.
+     */
+    public final Setting<Boolean> itemSaver = new Setting<>(false);
+
+    /**
+     * Durability to leave on the tool when using itemSaver
+     */
+    public final Setting<Integer> itemSaverThreshold = new Setting<>(10);
+
    /**
     * Always prefer silk touch tools over regular tools. This will not sacrifice speed, but it will always prefer silk
     * touch tools over other tools of the same speed. This includes always choosing ANY silk touch tool over your hand.
@@ -744,6 +795,7 @@ public final class Settings {

    /**
     * Sets the minimum y level whilst mining - set to 0 to turn off.
+     * if world has negative y values, subtract the min world height to get the value to put here
     */
    public final Setting<Integer> minYLevelWhileMining = new Setting<>(0);

@@ -760,7 +812,7 @@ public final class Settings {
    public final Setting<Integer> allowOnlyExposedOresDistance = new Setting<>(1);

    /**
-     * When GetToBlock doesn't know any locations for the desired block, explore randomly instead of giving up.
+     * When GetToBlock or non-legit Mine doesn't know any locations for the desired block, explore randomly instead of giving up.
     */
    public final Setting<Boolean> exploreForBlocks = new Setting<>(true);

@@ -812,6 +864,11 @@ public final class Settings {
     */
    public final Setting<Boolean> layerOrder = new Setting<>(false);

+    /**
+     * How high should the individual layers be?
+     */
+    public final Setting<Integer> layerHeight = new Setting<>(1);
+
    /**
     * Start building the schematic at a specific layer.
     * Can help on larger builds when schematic wants to break things its already built
@@ -823,6 +880,11 @@ public final class Settings {
     */
    public final Setting<Boolean> skipFailedLayers = new Setting<>(false);

+    /**
+     * Only build the selected part of schematics
+     */
+     public final Setting<Boolean> buildOnlySelection = new Setting<>(false);
+
    /**
     * How far to move before repeating the build. 0 to disable repeating on a certain axis, 0,0,0 to disable entirely
     */
@@ -833,6 +895,13 @@ public final class Settings {
     */
    public final Setting<Integer> buildRepeatCount = new Setting<>(-1);

+    /**
+     * Don't notify schematics that they are moved.
+     * e.g. replacing will replace the same spots for every repetition
+     * Mainly for backward compatibility.
+     */
+    public final Setting<Boolean> buildRepeatSneaky = new Setting<>(true);
+
    /**
     * Allow standing above a block while mining it, in BuilderProcess
     * <p>
@@ -941,6 +1010,7 @@ public final class Settings {
     * Disallow MineBehavior from using X-Ray to see where the ores are. Turn this option on to force it to mine "legit"
     * where it will only mine an ore once it can actually see it, so it won't do or know anything that a normal player
     * couldn't. If you don't want it to look like you're X-Raying, turn this on
+     * This will always explore, regardless of exploreForBlocks
     */
    public final Setting<Boolean> legitMine = new Setting<>(false);

@@ -1025,7 +1095,26 @@ public final class Settings {
     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
     * {@link Setting#value};
     */
-    public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);
+    public final Setting<Consumer<Component>> logger = new Setting<>(Minecraft.getInstance().gui.getChat()::addMessage);
+
+    /**
+     * The function that is called when Baritone will send a desktop notification. This function can be added to
+     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
+     * {@link Setting#value};
+     */
+    public final Setting<BiConsumer<String, Boolean>> notifier = new Setting<>(NotificationHelper::notify);
+
+    /**
+     * The function that is called when Baritone will show a toast. This function can be added to
+     * via {@link Consumer#andThen(Consumer)} or it can completely be overriden via setting
+     * {@link Setting#value};
+     */
+    public final Setting<BiConsumer<Component, Component>> toaster = new Setting<>(BaritoneToast::addOrUpdate);
+
+    /**
+     * Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors
+     */
+    public final Setting<Boolean> verboseCommandExceptions = new Setting<>(false);

    /**
     * The size of the box that is rendered when the current goal is a GoalYLevel
@@ -1117,6 +1206,11 @@ public final class Settings {
     */
    public final Setting<Boolean> renderSelectionCorners = new Setting<>(true);

+    /**
+     * Use sword to mine.
+     */
+    public final Setting<Boolean> useSwordToMine = new Setting<>(true);
+
    /**
     * Desktop notifications
     */
--- a/src/api/java/baritone/api/behavior/IPathingBehavior.java
+++ b/src/api/java/baritone/api/behavior/IPathingBehavior.java
@@ -58,6 +58,15 @@ public interface IPathingBehavior extends IBehavior {
        return Optional.of(current.getPath().ticksRemainingFrom(start));
    }

+    /**
+     * Returns the estimated remaining ticks to the current goal.
+     * Given that the return type is an optional, {@link Optional#empty()}
+     * will be returned in the case that there is no current goal.
+     *
+     * @return The estimated remaining ticks to the current goal.
+     */
+    Optional<Double> estimatedTicksToGoal();
+
    /**
     * @return The current pathing goal
     */
--- a/src/api/java/baritone/api/cache/IBlockTypeAccess.java
+++ b/src/api/java/baritone/api/cache/IBlockTypeAccess.java
@@ -17,8 +17,8 @@

 package baritone.api.cache;

-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;

 /**
 * @author Brady
@@ -26,9 +26,9 @@ import net.minecraft.util.math.BlockPos;
 */
 public interface IBlockTypeAccess {

-    IBlockState getBlock(int x, int y, int z);
+    BlockState getBlock(int x, int y, int z);

-    default IBlockState getBlock(BlockPos pos) {
+    default BlockState getBlock(BlockPos pos) {
        return getBlock(pos.getX(), pos.getY(), pos.getZ());
    }
 }
--- a/src/api/java/baritone/api/cache/ICachedWorld.java
+++ b/src/api/java/baritone/api/cache/ICachedWorld.java
@@ -17,10 +17,9 @@

 package baritone.api.cache;

-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.chunk.Chunk;
-
 import java.util.ArrayList;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.chunk.LevelChunk;

 /**
 * @author Brady
@@ -44,7 +43,7 @@ public interface ICachedWorld {
     *
     * @param chunk The chunk to pack and store
     */
-    void queueForPacking(Chunk chunk);
+    void queueForPacking(LevelChunk chunk);

    /**
     * Returns whether or not the block at the specified X and Z coordinates
--- a/src/api/java/baritone/api/cache/IContainerMemory.java
+++ b/src/api/java/baritone/api/cache/IContainerMemory.java
@@ -1,44 +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 <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.cache;
-
-import net.minecraft.util.math.BlockPos;
-
-import java.util.Map;
-
-/**
- * @author Brady
- * @since 9/23/2018
- */
-public interface IContainerMemory {
-
-    /**
-     * Gets a remembered inventory by its block position.
-     *
-     * @param pos The position of the container block
-     * @return The remembered inventory
-     */
-    IRememberedInventory getInventoryByPos(BlockPos pos);
-
-    /**
-     * Gets the map of all block positions to their remembered inventories.
-     *
-     * @return Map of block positions to their respective remembered inventories
-     */
-    Map<BlockPos, IRememberedInventory> getRememberedInventories();
-}
--- a/src/api/java/baritone/api/cache/IWorldData.java
+++ b/src/api/java/baritone/api/cache/IWorldData.java
@@ -37,9 +37,4 @@ public interface IWorldData {
     */
    IWaypointCollection getWaypoints();

-    /**
-     * @return The {@link IContainerMemory} instance
-     * @see IContainerMemory
-     */
-    IContainerMemory getContainerMemory();
 }
--- a/src/api/java/baritone/api/cache/IWorldScanner.java
+++ b/src/api/java/baritone/api/cache/IWorldScanner.java
@@ -19,11 +19,10 @@ package baritone.api.cache;

 import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
-import net.minecraft.block.Block;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
-
 import java.util.List;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.block.Block;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/command/argument/IArgConsumer.java
+++ b/src/api/java/baritone/api/command/argument/IArgConsumer.java
@@ -27,11 +27,10 @@ import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.command.exception.CommandNotEnoughArgumentsException;
 import baritone.api.command.exception.CommandTooManyArgumentsException;
 import baritone.api.utils.Helper;
-import net.minecraft.util.EnumFacing;
-
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.stream.Stream;
+import net.minecraft.core.Direction;

 /**
 * The {@link IArgConsumer} is how {@link ICommand}s read the arguments passed to them. This class has many benefits:
@@ -404,8 +403,8 @@ public interface IArgConsumer {
    /**
     * Gets an enum value from the enum class with the same name as the next argument's value
     * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
-     * {@link EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
+     * {@link Direction#UP}
     *
     * @param enumClass The enum class to search
     * @return An enum constant of that class with the same name as the next argument's value
@@ -419,8 +418,8 @@ public interface IArgConsumer {
    /**
     * Gets an enum value from the enum class with the same name as the next argument's value
     * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
-     * {@link EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
+     * {@link Direction#UP}
     *
     * @param enumClass The enum class to search
     * @param def       The default value
@@ -436,8 +435,8 @@ public interface IArgConsumer {
    /**
     * Gets an enum value from the enum class with the same name as the next argument's value
     * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and the next argument's value is "up", this will return
-     * {@link EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and the next argument's value is "up", this will return
+     * {@link Direction#UP}
     *
     * @param enumClass The enum class to search
     * @return An enum constant of that class with the same name as the next argument's value, or {@code null} if it
--- a/src/api/java/baritone/api/command/argument/ICommandArgument.java
+++ b/src/api/java/baritone/api/command/argument/ICommandArgument.java
@@ -19,7 +19,7 @@ package baritone.api.command.argument;

 import baritone.api.command.argparser.IArgParser;
 import baritone.api.command.exception.CommandInvalidTypeException;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.core.Direction;

 /**
 * A {@link ICommandArgument} is an immutable object representing one command argument. It contains data on the index of
@@ -50,8 +50,8 @@ public interface ICommandArgument {
    /**
     * Gets an enum value from the enum class with the same name as this argument's value
     * <p>
-     * For example if you getEnum as an {@link EnumFacing}, and this argument's value is "up", it will return {@link
-     * EnumFacing#UP}
+     * For example if you getEnum as an {@link Direction}, and this argument's value is "up", it will return {@link
+     * Direction#UP}
     *
     * @param enumClass The enum class to search
     * @return An enum constant of that class with the same name as this argument's value
--- a/src/api/java/baritone/api/command/datatypes/BlockById.java
+++ b/src/api/java/baritone/api/command/datatypes/BlockById.java
@@ -19,12 +19,10 @@ package baritone.api.command.datatypes;

 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.IRegistry;
-
 import java.util.stream.Stream;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;

 public enum BlockById implements IDatatypeFor<Block> {
    INSTANCE;
@@ -33,7 +31,7 @@ public enum BlockById implements IDatatypeFor<Block> {
    public Block get(IDatatypeContext ctx) throws CommandException {
        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
        Block block;
-        if ((block = IRegistry.BLOCK.get(id)) == Blocks.AIR) {
+        if ((block = Registry.BLOCK.getOptional(id).orElse(null)) == null) {
            throw new IllegalArgumentException("no block found by that id");
        }
        return block;
@@ -43,7 +41,7 @@ public enum BlockById implements IDatatypeFor<Block> {
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
                .append(
-                        IRegistry.BLOCK.keySet()
+                        Registry.BLOCK.keySet()
                                .stream()
                                .map(Object::toString)
                )
--- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java
+++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java
@@ -19,11 +19,10 @@ package baritone.api.command.datatypes;

 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.entity.EntityType;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.IRegistry;
-
 import java.util.stream.Stream;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.EntityType;

 public enum EntityClassById implements IDatatypeFor<EntityType> {
    INSTANCE;
@@ -32,7 +31,7 @@ public enum EntityClassById implements IDatatypeFor<EntityType> {
    public EntityType get(IDatatypeContext ctx) throws CommandException {
        ResourceLocation id = new ResourceLocation(ctx.getConsumer().getString());
        EntityType entity;
-        if ((entity = IRegistry.ENTITY_TYPE.get(id)) == null) {
+        if ((entity = Registry.ENTITY_TYPE.getOptional(id).orElse(null)) == null) {
            throw new IllegalArgumentException("no entity found by that id");
        }
        return entity;
@@ -41,7 +40,7 @@ public enum EntityClassById implements IDatatypeFor<EntityType> {
    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
-                .append(IRegistry.ENTITY_TYPE.stream().map(Object::toString))
+                .append(Registry.ENTITY_TYPE.stream().map(Object::toString))
                .filterPrefixNamespaced(ctx.getConsumer().getString())
                .sortAlphabetically()
                .stream();
--- a/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java
+++ b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java
@@ -19,24 +19,23 @@ package baritone.api.command.datatypes;

 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.util.EnumFacing;
-
 import java.util.Locale;
 import java.util.stream.Stream;
+import net.minecraft.core.Direction;

-public enum ForEnumFacing implements IDatatypeFor<EnumFacing> {
+public enum ForDirection implements IDatatypeFor<Direction> {
    INSTANCE;

    @Override
-    public EnumFacing get(IDatatypeContext ctx) throws CommandException {
-        return EnumFacing.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
+    public Direction get(IDatatypeContext ctx) throws CommandException {
+        return Direction.valueOf(ctx.getConsumer().getString().toUpperCase(Locale.US));
    }

    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
-                .append(Stream.of(EnumFacing.values())
-                        .map(EnumFacing::getName).map(String::toLowerCase))
+                .append(Stream.of(Direction.values())
+                        .map(Direction::getName).map(String::toLowerCase))
                .filterPrefix(ctx.getConsumer().getString())
                .stream();
    }
--- a/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java
+++ b/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java
@@ -20,21 +20,20 @@ package baritone.api.command.datatypes;
 import baritone.api.IBaritone;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.helpers.TabCompleteHelper;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.text.ITextComponent;
-
 import java.util.List;
 import java.util.stream.Stream;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Player;

 /**
 * An {@link IDatatype} used to resolve nearby players, those within
 * render distance of the target {@link IBaritone} instance.
 */
-public enum NearbyPlayer implements IDatatypeFor<EntityPlayer> {
+public enum NearbyPlayer implements IDatatypeFor<Player> {
    INSTANCE;

    @Override
-    public EntityPlayer get(IDatatypeContext ctx) throws CommandException {
+    public Player get(IDatatypeContext ctx) throws CommandException {
        final String username = ctx.getConsumer().getString();
        return getPlayers(ctx).stream()
                .filter(s -> s.getName().getString().equalsIgnoreCase(username))
@@ -44,13 +43,13 @@ public enum NearbyPlayer implements IDatatypeFor<EntityPlayer> {
    @Override
    public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
        return new TabCompleteHelper()
-                .append(getPlayers(ctx).stream().map(EntityPlayer::getName).map(ITextComponent::getString))
+                .append(getPlayers(ctx).stream().map(Player::getName).map(Component::getString))
                .filterPrefix(ctx.getConsumer().getString())
                .sortAlphabetically()
                .stream();
    }

-    private static List<EntityPlayer> getPlayers(IDatatypeContext ctx) {
-        return ctx.getBaritone().getPlayerContext().world().playerEntities;
+    private static List<? extends Player> getPlayers(IDatatypeContext ctx) {
+        return ctx.getBaritone().getPlayerContext().world().players();
    }
 }
--- a/src/api/java/baritone/api/command/datatypes/RelativeFile.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeFile.java
@@ -94,7 +94,7 @@ public enum RelativeFile implements IDatatypePost<File, File> {
    }

    public static File gameDir() {
-        File gameDir = HELPER.mc.gameDir.getAbsoluteFile();
+        File gameDir = HELPER.mc.gameDirectory.getAbsoluteFile();
        if (gameDir.getName().equals(".")) {
            return gameDir.getParentFile();
        }
--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
@@ -21,9 +21,8 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.math.MathHelper;
-
 import java.util.stream.Stream;
+import net.minecraft.util.Mth;

 public enum RelativeGoalBlock implements IDatatypePost<GoalBlock, BetterBlockPos> {
    INSTANCE;
@@ -36,9 +35,9 @@ public enum RelativeGoalBlock implements IDatatypePost<GoalBlock, BetterBlockPos

        final IArgConsumer consumer = ctx.getConsumer();
        return new GoalBlock(
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
+                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
+                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y)),
+                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
        );
    }

--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java
@@ -21,9 +21,8 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalXZ;
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.math.MathHelper;
-
 import java.util.stream.Stream;
+import net.minecraft.util.Mth;

 public enum RelativeGoalXZ implements IDatatypePost<GoalXZ, BetterBlockPos> {
    INSTANCE;
@@ -36,8 +35,8 @@ public enum RelativeGoalXZ implements IDatatypePost<GoalXZ, BetterBlockPos> {

        final IArgConsumer consumer = ctx.getConsumer();
        return new GoalXZ(
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
-                MathHelper.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
+                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.x)),
+                Mth.floor(consumer.getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.z))
        );
    }

--- a/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
+++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
@@ -21,9 +21,8 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.pathing.goals.GoalYLevel;
 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.math.MathHelper;
-
 import java.util.stream.Stream;
+import net.minecraft.util.Mth;

 public enum RelativeGoalYLevel implements IDatatypePost<GoalYLevel, BetterBlockPos> {
    INSTANCE;
@@ -35,7 +34,7 @@ public enum RelativeGoalYLevel implements IDatatypePost<GoalYLevel, BetterBlockP
        }

        return new GoalYLevel(
-                MathHelper.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
+                Mth.floor(ctx.getConsumer().getDatatypePost(RelativeCoordinate.INSTANCE, (double) origin.y))
        );
    }

--- a/src/api/java/baritone/api/command/exception/CommandUnhandledException.java
+++ b/src/api/java/baritone/api/command/exception/CommandUnhandledException.java
@@ -19,9 +19,8 @@ package baritone.api.command.exception;

 import baritone.api.command.ICommand;
 import baritone.api.command.argument.ICommandArgument;
-import net.minecraft.util.text.TextFormatting;
-
 import java.util.List;
+import net.minecraft.ChatFormatting;

 import static baritone.api.utils.Helper.HELPER;

@@ -39,7 +38,7 @@ public class CommandUnhandledException extends RuntimeException implements IComm
    public void handle(ICommand command, List<ICommandArgument> args) {
        HELPER.logDirect("An unhandled exception occurred. " +
                        "The error is in your game's log, please report this at https://github.com/cabaletta/baritone/issues",
-                TextFormatting.RED);
+                ChatFormatting.RED);

        this.printStackTrace();
    }
--- a/src/api/java/baritone/api/command/exception/ICommandException.java
+++ b/src/api/java/baritone/api/command/exception/ICommandException.java
@@ -19,9 +19,8 @@ package baritone.api.command.exception;

 import baritone.api.command.ICommand;
 import baritone.api.command.argument.ICommandArgument;
-import net.minecraft.util.text.TextFormatting;
-
 import java.util.List;
+import net.minecraft.ChatFormatting;

 import static baritone.api.utils.Helper.HELPER;

@@ -50,6 +49,6 @@ public interface ICommandException {
     * @param args    The arguments the command was called with.
     */
    default void handle(ICommand command, List<ICommandArgument> args) {
-        HELPER.logDirect(this.getMessage(), TextFormatting.RED);
+        HELPER.logDirect(this.getMessage(), ChatFormatting.RED);
    }
 }
--- a/src/api/java/baritone/api/command/helpers/Paginator.java
+++ b/src/api/java/baritone/api/command/helpers/Paginator.java
@@ -21,15 +21,15 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.utils.Helper;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.event.ClickEvent;
-import net.minecraft.util.text.event.HoverEvent;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.BaseComponent;
+import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.network.chat.TextComponent;

 public class Paginator<E> implements Helper {

@@ -63,59 +63,59 @@ public class Paginator<E> implements Helper {
        return this;
    }

-    public void display(Function<E, ITextComponent> transform, String commandPrefix) {
+    public void display(Function<E, Component> transform, String commandPrefix) {
        int offset = (page - 1) * pageSize;
        for (int i = offset; i < offset + pageSize; i++) {
            if (i < entries.size()) {
                logDirect(transform.apply(entries.get(i)));
            } else {
-                logDirect("--", TextFormatting.DARK_GRAY);
+                logDirect("--", ChatFormatting.DARK_GRAY);
            }
        }
        boolean hasPrevPage = commandPrefix != null && validPage(page - 1);
        boolean hasNextPage = commandPrefix != null && validPage(page + 1);
-        ITextComponent prevPageComponent = new TextComponentString("<<");
+        BaseComponent prevPageComponent = new TextComponent("<<");
        if (hasPrevPage) {
-            prevPageComponent.getStyle()
-                    .setClickEvent(new ClickEvent(
+            prevPageComponent.setStyle(prevPageComponent.getStyle()
+                    .withClickEvent(new ClickEvent(
                            ClickEvent.Action.RUN_COMMAND,
                            String.format("%s %d", commandPrefix, page - 1)
                    ))
-                    .setHoverEvent(new HoverEvent(
+                    .withHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
-                            new TextComponentString("Click to view previous page")
-                    ));
+                            new TextComponent("Click to view previous page")
+                    )));
        } else {
-            prevPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
+            prevPageComponent.setStyle(prevPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
        }
-        ITextComponent nextPageComponent = new TextComponentString(">>");
+        BaseComponent nextPageComponent = new TextComponent(">>");
        if (hasNextPage) {
-            nextPageComponent.getStyle()
-                    .setClickEvent(new ClickEvent(
+            nextPageComponent.setStyle(nextPageComponent.getStyle()
+                    .withClickEvent(new ClickEvent(
                            ClickEvent.Action.RUN_COMMAND,
                            String.format("%s %d", commandPrefix, page + 1)
                    ))
-                    .setHoverEvent(new HoverEvent(
+                    .withHoverEvent(new HoverEvent(
                            HoverEvent.Action.SHOW_TEXT,
-                            new TextComponentString("Click to view next page")
-                    ));
+                            new TextComponent("Click to view next page")
+                    )));
        } else {
-            nextPageComponent.getStyle().setColor(TextFormatting.DARK_GRAY);
+            nextPageComponent.setStyle(nextPageComponent.getStyle().withColor(ChatFormatting.DARK_GRAY));
        }
-        ITextComponent pagerComponent = new TextComponentString("");
-        pagerComponent.getStyle().setColor(TextFormatting.GRAY);
-        pagerComponent.appendSibling(prevPageComponent);
-        pagerComponent.appendText(" | ");
-        pagerComponent.appendSibling(nextPageComponent);
-        pagerComponent.appendText(String.format(" %d/%d", page, getMaxPage()));
+        BaseComponent pagerComponent = new TextComponent("");
+        pagerComponent.setStyle(pagerComponent.getStyle().withColor(ChatFormatting.GRAY));
+        pagerComponent.append(prevPageComponent);
+        pagerComponent.append(" | ");
+        pagerComponent.append(nextPageComponent);
+        pagerComponent.append(String.format(" %d/%d", page, getMaxPage()));
        logDirect(pagerComponent);
    }

-    public void display(Function<E, ITextComponent> transform) {
+    public void display(Function<E, Component> transform) {
        display(transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, Component> transform, String commandPrefix) throws CommandException {
        int page = 1;
        consumer.requireMax(1);
        if (consumer.hasAny()) {
@@ -138,47 +138,47 @@ public class Paginator<E> implements Helper {
        pagi.display(transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, Component> transform, String commandPrefix) throws CommandException {
        paginate(consumer, new Paginator<>(elems), pre, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, Component> transform, String commandPrefix) throws CommandException {
        paginate(consumer, Arrays.asList(elems), pre, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, Component> transform, String commandPrefix) throws CommandException {
        paginate(consumer, pagi, null, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, Component> transform, String commandPrefix) throws CommandException {
        paginate(consumer, new Paginator<>(elems), null, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform, String commandPrefix) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, Component> transform, String commandPrefix) throws CommandException {
        paginate(consumer, Arrays.asList(elems), null, transform, commandPrefix);
    }

-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Runnable pre, Function<T, Component> transform) throws CommandException {
        paginate(consumer, pagi, pre, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Runnable pre, Function<T, Component> transform) throws CommandException {
        paginate(consumer, new Paginator<>(elems), pre, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, ITextComponent> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Runnable pre, Function<T, Component> transform) throws CommandException {
        paginate(consumer, Arrays.asList(elems), pre, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, ITextComponent> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, Paginator<T> pagi, Function<T, Component> transform) throws CommandException {
        paginate(consumer, pagi, null, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, ITextComponent> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, List<T> elems, Function<T, Component> transform) throws CommandException {
        paginate(consumer, new Paginator<>(elems), null, transform, null);
    }

-    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, ITextComponent> transform) throws CommandException {
+    public static <T> void paginate(IArgConsumer consumer, T[] elems, Function<T, Component> transform) throws CommandException {
        paginate(consumer, Arrays.asList(elems), null, transform, null);
    }
 }
--- a/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
+++ b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java
@@ -23,14 +23,13 @@ import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.manager.ICommandManager;
 import baritone.api.event.events.TabCompleteEvent;
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.ResourceLocation;
-
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
+import net.minecraft.resources.ResourceLocation;

 /**
 * The {@link TabCompleteHelper} is a <b>single-use</b> object that helps you handle tab completion. It includes helper
@@ -253,8 +252,8 @@ public class TabCompleteHelper {
    public TabCompleteHelper addSettings() {
        return append(
                BaritoneAPI.getSettings().allSettings.stream()
+                        .filter(s -> !SettingsUtil.javaOnlySetting(s))
                        .map(Settings.Setting::getName)
-                        .filter(s -> !s.equalsIgnoreCase("logger"))
                        .sorted(String.CASE_INSENSITIVE_ORDER)
        );
    }
--- a/src/api/java/baritone/api/event/events/BlockInteractEvent.java
+++ b/src/api/java/baritone/api/event/events/BlockInteractEvent.java
@@ -17,7 +17,7 @@

 package baritone.api.event.events;

-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;

 /**
 * Called when the local player interacts with a block, can be either {@link Type#START_BREAK} or {@link Type#USE}.
--- a/src/api/java/baritone/api/event/events/PacketEvent.java
+++ b/src/api/java/baritone/api/event/events/PacketEvent.java
@@ -18,8 +18,8 @@
 package baritone.api.event.events;

 import baritone.api.event.events.type.EventState;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.Packet;
+import net.minecraft.network.Connection;
+import net.minecraft.network.protocol.Packet;

 /**
 * @author Brady
@@ -27,19 +27,19 @@ import net.minecraft.network.Packet;
 */
 public final class PacketEvent {

-    private final NetworkManager networkManager;
+    private final Connection networkManager;

    private final EventState state;

    private final Packet<?> packet;

-    public PacketEvent(NetworkManager networkManager, EventState state, Packet<?> packet) {
+    public PacketEvent(Connection networkManager, EventState state, Packet<?> packet) {
        this.networkManager = networkManager;
        this.state = state;
        this.packet = packet;
    }

-    public final NetworkManager getNetworkManager() {
+    public final Connection getNetworkManager() {
        return this.networkManager;
    }

--- a/src/api/java/baritone/api/event/events/RenderEvent.java
+++ b/src/api/java/baritone/api/event/events/RenderEvent.java
@@ -17,6 +17,9 @@

 package baritone.api.event.events;

+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
+
 /**
 * @author Brady
 * @since 8/5/2018
@@ -28,8 +31,13 @@ public final class RenderEvent {
     */
    private final float partialTicks;

-    public RenderEvent(float partialTicks) {
+    private final Matrix4f projectionMatrix;
+    private final PoseStack modelViewStack;
+
+    public RenderEvent(float partialTicks, PoseStack modelViewStack, Matrix4f projectionMatrix) {
        this.partialTicks = partialTicks;
+        this.modelViewStack = modelViewStack;
+        this.projectionMatrix = projectionMatrix;
    }

    /**
@@ -38,4 +46,12 @@ public final class RenderEvent {
    public final float getPartialTicks() {
        return this.partialTicks;
    }
+
+    public PoseStack getModelViewStack() {
+        return this.modelViewStack;
+    }
+
+    public Matrix4f getProjectionMatrix() {
+        return this.projectionMatrix;
+    }
 }
--- a/src/api/java/baritone/api/event/events/RotationMoveEvent.java
+++ b/src/api/java/baritone/api/event/events/RotationMoveEvent.java
@@ -17,8 +17,9 @@

 package baritone.api.event.events;

-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.phys.Vec3;

 /**
 * @author Brady
@@ -69,14 +70,14 @@ public final class RotationMoveEvent {
        /**
         * Called when the player's motion is updated.
         *
-         * @see Entity#moveRelative(float, float, float, float)
+         * @see Entity#moveRelative(float, Vec3)
         */
        MOTION_UPDATE,

        /**
         * Called when the player jumps.
         *
-         * @see EntityLivingBase#jump
+         * @see LivingEntity
         */
        JUMP
    }
--- a/src/api/java/baritone/api/event/events/WorldEvent.java
+++ b/src/api/java/baritone/api/event/events/WorldEvent.java
@@ -18,7 +18,7 @@
 package baritone.api.event.events;

 import baritone.api.event.events.type.EventState;
-import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.multiplayer.ClientLevel;

 /**
 * @author Brady
@@ -29,14 +29,14 @@ public final class WorldEvent {
    /**
     * The new world that is being loaded. {@code null} if being unloaded.
     */
-    private final WorldClient world;
+    private final ClientLevel world;

    /**
     * The state of the event
     */
    private final EventState state;

-    public WorldEvent(WorldClient world, EventState state) {
+    public WorldEvent(ClientLevel world, EventState state) {
        this.world = world;
        this.state = state;
    }
@@ -44,7 +44,7 @@ public final class WorldEvent {
    /**
     * @return The new world that is being loaded. {@code null} if being unloaded.
     */
-    public final WorldClient getWorld() {
+    public final ClientLevel getWorld() {
        return this.world;
    }

--- a/src/api/java/baritone/api/event/listener/IGameEventListener.java
+++ b/src/api/java/baritone/api/event/listener/IGameEventListener.java
@@ -19,12 +19,12 @@ package baritone.api.event.listener;

 import baritone.api.event.events.*;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.GuiGameOver;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.entity.Entity;
-import net.minecraft.network.Packet;
+import net.minecraft.client.gui.screens.DeathScreen;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.phys.Vec3;

 /**
 * @author Brady
@@ -36,7 +36,7 @@ public interface IGameEventListener {
     * Run once per game tick before screen input is handled.
     *
     * @param event The event
-     * @see Minecraft#runTick()
+     * @see Minecraft#tick()
     */
    void onTick(TickEvent event);

@@ -44,7 +44,7 @@ public interface IGameEventListener {
     * Run once per game tick from before and after the player rotation is sent to the server.
     *
     * @param event The event
-     * @see EntityPlayerSP#tick()
+     * @see LocalPlayer#tick()
     */
    void onPlayerUpdate(PlayerUpdateEvent event);

@@ -52,7 +52,7 @@ public interface IGameEventListener {
     * Runs whenever the client player sends a message to the server.
     *
     * @param event The event
-     * @see EntityPlayerSP#sendChatMessage(String)
+     * @see LocalPlayer#chat(String)
     */
    void onSendChatMessage(ChatEvent event);

@@ -81,7 +81,7 @@ public interface IGameEventListener {
     * Runs before and after whenever a new world is loaded
     *
     * @param event The event
-     * @see Minecraft#loadWorld(WorldClient, GuiScreen)
+     * @see Minecraft#setLevel(ClientLevel)
     */
    void onWorldEvent(WorldEvent event);

@@ -106,15 +106,15 @@ public interface IGameEventListener {
     * and before and after the player jumps.
     *
     * @param event The event
-     * @see Entity#moveRelative(float, float, float, float)
+     * @see Entity#moveRelative(float, Vec3)
     */
    void onPlayerRotationMove(RotationMoveEvent event);

    /**
-     * Called whenever the sprint keybind state is checked in {@link EntityPlayerSP#livingTick}
+     * Called whenever the sprint keybind state is checked in {@link LocalPlayer#aiStep}
     *
     * @param event The event
-     * @see EntityPlayerSP#livingTick()
+     * @see LocalPlayer#aiStep()
     */
    void onPlayerSprintState(SprintStateEvent event);

@@ -126,9 +126,9 @@ public interface IGameEventListener {
    void onBlockInteract(BlockInteractEvent event);

    /**
-     * Called when the local player dies, as indicated by the creation of the {@link GuiGameOver} screen.
+     * Called when the local player dies, as indicated by the creation of the {@link DeathScreen} screen.
     *
-     * @see GuiGameOver
+     * @see DeathScreen
     */
    void onPlayerDeath();

--- a/src/api/java/baritone/api/pathing/goals/Goal.java
+++ b/src/api/java/baritone/api/pathing/goals/Goal.java
@@ -17,7 +17,7 @@

 package baritone.api.pathing.goals;

-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;

 /**
 * An abstract Goal for pathing, can be anything from a specific block to just a Y coordinate.
@@ -54,4 +54,18 @@ public interface Goal {
    default double heuristic(BlockPos pos) {
        return heuristic(pos.getX(), pos.getY(), pos.getZ());
    }
+
+    /**
+     * Returns the heuristic at the goal.
+     * i.e. {@code heuristic() == heuristic(x,y,z)}
+     * when {@code isInGoal(x,y,z) == true}
+     * This is needed by {@code PathingBehavior#estimatedTicksToGoal} because
+     * some Goals actually do not have a heuristic of 0 when that condition is met
+     *
+     * @return The estimate number of ticks to satisfy the goal when the goal
+     * is already satisfied
+     */
+    default double heuristic() {
+        return 0;
+    }
 }
--- a/src/api/java/baritone/api/pathing/goals/GoalBlock.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalBlock.java
@@ -19,7 +19,7 @@ package baritone.api.pathing.goals;

 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;

 /**
 * A specific BlockPos goal
@@ -87,9 +87,9 @@ public class GoalBlock implements Goal, IGoalRenderPos {
    public static double calculate(double xDiff, int yDiff, double zDiff) {
        double heuristic = 0;

-        // if yDiff is 1 that means that pos.getY()-this.y==1 which means that we're 1 block below where we should be
-        // therefore going from 0,0,0 to a GoalYLevel of pos.getY()-this.y is accurate
-        heuristic += GoalYLevel.calculate(yDiff, 0);
+        // if yDiff is 1 that means that currentY-goalY==1 which means that we're 1 block above where we should be
+        // therefore going from 0,yDiff,0 to a GoalYLevel of 0 is accurate
+        heuristic += GoalYLevel.calculate(0, yDiff);

        //use the pythagorean and manhattan mixture from GoalXZ
        heuristic += GoalXZ.calculate(xDiff, zDiff);
--- a/src/api/java/baritone/api/pathing/goals/GoalComposite.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalComposite.java
@@ -57,6 +57,16 @@ public class GoalComposite implements Goal {
        return min;
    }

+    @Override
+    public double heuristic() {
+        double min = Double.MAX_VALUE;
+        for (Goal g : goals) {
+            // just take the highest value that is guaranteed to be inside the goal
+            min = Math.min(min, g.heuristic());
+        }
+        return min;
+    }
+
    @Override
    public String toString() {
        return "GoalComposite" + Arrays.toString(goals);
--- a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java
@@ -19,7 +19,7 @@ package baritone.api.pathing.goals;

 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;


 /**
--- a/src/api/java/baritone/api/pathing/goals/GoalInverted.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalInverted.java
@@ -45,6 +45,11 @@ public class GoalInverted implements Goal {
        return -origin.heuristic(x, y, z);
    }

+    @Override
+    public double heuristic() {
+        return Double.NEGATIVE_INFINITY;
+    }
+
    @Override
    public String toString() {
        return String.format("GoalInverted{%s}", origin.toString());
--- a/src/api/java/baritone/api/pathing/goals/GoalNear.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalNear.java
@@ -19,7 +19,9 @@ package baritone.api.pathing.goals;

 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.util.math.BlockPos;
+import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
+import it.unimi.dsi.fastutil.doubles.DoubleIterator;
+import net.minecraft.core.BlockPos;

 public class GoalNear implements Goal, IGoalRenderPos {

@@ -51,6 +53,34 @@ public class GoalNear implements Goal, IGoalRenderPos {
        return GoalBlock.calculate(xDiff, yDiff, zDiff);
    }

+    @Override
+    public double heuristic() {// TODO less hacky solution
+        int range = (int) Math.ceil(Math.sqrt(rangeSq));
+        DoubleOpenHashSet maybeAlwaysInside = new DoubleOpenHashSet(); // see pull request #1978
+        double minOutside = Double.POSITIVE_INFINITY;
+        for (int dx = -range; dx <= range; dx++) {
+            for (int dy = -range; dy <= range; dy++) {
+                for (int dz = -range; dz <= range; dz++) {
+                    double h = heuristic(x + dx, y + dy, z + dz);
+                    if (h < minOutside && isInGoal(x + dx, y + dy, z + dz)) {
+                        maybeAlwaysInside.add(h);
+                    } else {
+                        minOutside = Math.min(minOutside, h);
+                    }
+                }
+            }
+        }
+        double maxInside = Double.NEGATIVE_INFINITY;
+        DoubleIterator it = maybeAlwaysInside.iterator();
+        while (it.hasNext()) {
+            double inside = it.nextDouble();
+            if (inside < minOutside) {
+                maxInside = Math.max(maxInside, inside);
+            }
+        }
+        return maxInside;
+    }
+
    @Override
    public BlockPos getGoalPos() {
        return new BlockPos(x, y, z);
--- a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java
@@ -18,9 +18,10 @@
 package baritone.api.pathing.goals;

 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.math.BlockPos;
-
+import it.unimi.dsi.fastutil.doubles.DoubleOpenHashSet;
+import it.unimi.dsi.fastutil.doubles.DoubleIterator;
 import java.util.Arrays;
+import net.minecraft.core.BlockPos;

 /**
 * Useful for automated combat (retreating specifically)
@@ -65,7 +66,7 @@ public class GoalRunAway implements Goal {
    }

    @Override
-    public double heuristic(int x, int y, int z) {//mostly copied from GoalBlock
+    public double heuristic(int x, int y, int z) {// mostly copied from GoalBlock
        double min = Double.MAX_VALUE;
        for (BlockPos p : from) {
            double h = GoalXZ.calculate(p.getX() - x, p.getZ() - z);
@@ -80,6 +81,48 @@ public class GoalRunAway implements Goal {
        return min;
    }

+    @Override
+    public double heuristic() {// TODO less hacky solution
+        int distance = (int) Math.ceil(Math.sqrt(distanceSq));
+        int minX = Integer.MAX_VALUE;
+        int minY = Integer.MAX_VALUE;
+        int minZ = Integer.MAX_VALUE;
+        int maxX = Integer.MIN_VALUE;
+        int maxY = Integer.MIN_VALUE;
+        int maxZ = Integer.MIN_VALUE;
+        for (BlockPos p : from) {
+            minX = Math.min(minX, p.getX() - distance);
+            minY = Math.min(minY, p.getY() - distance);
+            minZ = Math.min(minZ, p.getZ() - distance);
+            maxX = Math.max(minX, p.getX() + distance);
+            maxY = Math.max(minY, p.getY() + distance);
+            maxZ = Math.max(minZ, p.getZ() + distance);
+        }
+        DoubleOpenHashSet maybeAlwaysInside = new DoubleOpenHashSet(); // see pull request #1978
+        double minOutside = Double.POSITIVE_INFINITY;
+        for (int x = minX; x <= maxX; x++) {
+            for (int y = minY; y <= maxY; y++) {
+                for (int z = minZ; z <= maxZ; z++) {
+                    double h = heuristic(x, y, z);
+                    if (h < minOutside && isInGoal(x, y, z)) {
+                        maybeAlwaysInside.add(h);
+                    } else {
+                        minOutside = Math.min(minOutside, h);
+                    }
+                }
+            }
+        }
+        double maxInside = Double.NEGATIVE_INFINITY;
+        DoubleIterator it = maybeAlwaysInside.iterator();
+        while (it.hasNext()) {
+            double inside = it.nextDouble();
+            if (inside < minOutside) {
+                maxInside = Math.max(maxInside, inside);
+            }
+        }
+        return maxInside;
+    }
+
    @Override
    public String toString() {
        if (maintainY != null) {
--- a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java
@@ -18,8 +18,8 @@
 package baritone.api.pathing.goals;

 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;

 /**
 * Dig a tunnel in a certain direction, but if you have to deviate from the path, go back to where you started
@@ -32,12 +32,12 @@ public class GoalStrictDirection implements Goal {
    public final int dx;
    public final int dz;

-    public GoalStrictDirection(BlockPos origin, EnumFacing direction) {
+    public GoalStrictDirection(BlockPos origin, Direction direction) {
        x = origin.getX();
        y = origin.getY();
        z = origin.getZ();
-        dx = direction.getXOffset();
-        dz = direction.getZOffset();
+        dx = direction.getStepX();
+        dz = direction.getStepZ();
        if (dx == 0 && dz == 0) {
            throw new IllegalArgumentException(direction + "");
        }
@@ -64,6 +64,11 @@ public class GoalStrictDirection implements Goal {
        return heuristic;
    }

+    @Override
+    public double heuristic() {
+        return Double.NEGATIVE_INFINITY;
+    }
+
    @Override
    public String toString() {
        return String.format(
--- a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java
@@ -19,7 +19,7 @@ package baritone.api.pathing.goals;

 import baritone.api.utils.SettingsUtil;
 import baritone.api.utils.interfaces.IGoalRenderPos;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;

 /**
 * Useful if the goal is just to mine a block. This goal will be satisfied if the specified
--- a/src/api/java/baritone/api/pathing/goals/GoalXZ.java
+++ b/src/api/java/baritone/api/pathing/goals/GoalXZ.java
@@ -20,8 +20,8 @@ package baritone.api.pathing.goals;
 import baritone.api.BaritoneAPI;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.SettingsUtil;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.Mth;
+import net.minecraft.world.phys.Vec3;

 /**
 * Useful for long-range goals that don't have a specific Y level.
@@ -94,11 +94,11 @@ public class GoalXZ implements Goal {
        return (diagonal + straight) * BaritoneAPI.getSettings().costHeuristic.value; // big TODO tune
    }

-    public static GoalXZ fromDirection(Vec3d origin, float yaw, double distance) {
+    public static GoalXZ fromDirection(Vec3 origin, float yaw, double distance) {
        float theta = (float) Math.toRadians(yaw);
-        double x = origin.x - MathHelper.sin(theta) * distance;
-        double z = origin.z + MathHelper.cos(theta) * distance;
-        return new GoalXZ(MathHelper.floor(x), MathHelper.floor(z));
+        double x = origin.x - Mth.sin(theta) * distance;
+        double z = origin.z + Mth.cos(theta) * distance;
+        return new GoalXZ(Mth.floor(x), Mth.floor(z));
    }

    public int getX() {
--- a/src/api/java/baritone/api/pathing/movement/IMovement.java
+++ b/src/api/java/baritone/api/pathing/movement/IMovement.java
@@ -18,7 +18,7 @@
 package baritone.api.pathing.movement;

 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/process/IBuilderProcess.java
+++ b/src/api/java/baritone/api/process/IBuilderProcess.java
@@ -18,11 +18,10 @@
 package baritone.api.process;

 import baritone.api.schematic.ISchematic;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3i;
-
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.level.block.state.BlockState;
 import java.io.File;
 import java.util.List;

@@ -52,7 +51,7 @@ public interface IBuilderProcess extends IBaritoneProcess {
    boolean build(String name, File schematic, Vec3i origin);

    default boolean build(String schematicFile, BlockPos origin) {
-        File file = new File(new File(Minecraft.getInstance().gameDir, "schematics"), schematicFile);
+        File file = new File(new File(Minecraft.getInstance().gameDirectory, "schematics"), schematicFile);
        return build(schematicFile, file, origin);
    }

@@ -71,5 +70,5 @@ public interface IBuilderProcess extends IBaritoneProcess {
     * schematics, for example, to pick a state that the builder process will be happy with, because any variation will
     * cause it to give up. This is updated every tick, but only while the builder process is active.
     */
-    List<IBlockState> getApproxPlaceable();
+    List<BlockState> getApproxPlaceable();
 }
--- a/src/api/java/baritone/api/process/IFarmProcess.java
+++ b/src/api/java/baritone/api/process/IFarmProcess.java
@@ -17,7 +17,7 @@

 package baritone.api.process;

-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;

 public interface IFarmProcess extends IBaritoneProcess {

--- a/src/api/java/baritone/api/process/IFollowProcess.java
+++ b/src/api/java/baritone/api/process/IFollowProcess.java
@@ -17,10 +17,9 @@

 package baritone.api.process;

-import net.minecraft.entity.Entity;
-
 import java.util.List;
 import java.util.function.Predicate;
+import net.minecraft.world.entity.Entity;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/process/IGetToBlockProcess.java
+++ b/src/api/java/baritone/api/process/IGetToBlockProcess.java
@@ -18,7 +18,7 @@
 package baritone.api.process;

 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.block.Block;
+import net.minecraft.world.level.block.Block;

 /**
 * but it rescans the world every once in a while so it doesn't get fooled by its cache
--- a/src/api/java/baritone/api/process/IMineProcess.java
+++ b/src/api/java/baritone/api/process/IMineProcess.java
@@ -19,9 +19,8 @@ package baritone.api.process;

 import baritone.api.utils.BlockOptionalMeta;
 import baritone.api.utils.BlockOptionalMetaLookup;
-import net.minecraft.block.Block;
-
 import java.util.stream.Stream;
+import net.minecraft.world.level.block.Block;

 /**
 * @author Brady
--- a/src/api/java/baritone/api/schematic/CompositeSchematic.java
+++ b/src/api/java/baritone/api/schematic/CompositeSchematic.java
@@ -17,10 +17,9 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
-
 import java.util.ArrayList;
 import java.util.List;
+import net.minecraft.world.level.block.state.BlockState;

 public class CompositeSchematic extends AbstractSchematic {

@@ -47,7 +46,7 @@ public class CompositeSchematic extends AbstractSchematic {
        recalcArr();
    }

-    private CompositeSchematicEntry getSchematic(int x, int y, int z, IBlockState currentState) {
+    private CompositeSchematicEntry getSchematic(int x, int y, int z, BlockState currentState) {
        for (CompositeSchematicEntry entry : schematicArr) {
            if (x >= entry.x && y >= entry.y && z >= entry.z &&
                    entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState)) {
@@ -58,17 +57,24 @@ public class CompositeSchematic extends AbstractSchematic {
    }

    @Override
-    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
        CompositeSchematicEntry entry = getSchematic(x, y, z, currentState);
        return entry != null && entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState);
    }

    @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
        CompositeSchematicEntry entry = getSchematic(x, y, z, current);
        if (entry == null) {
            throw new IllegalStateException("couldn't find schematic for this position");
        }
        return entry.schematic.desiredState(x - entry.x, y - entry.y, z - entry.z, current, approxPlaceable);
    }
+
+    @Override
+    public void reset() {
+        for (CompositeSchematicEntry entry : schematicArr) {
+            entry.schematic.reset();
+        }
+    }
 }
--- a/src/api/java/baritone/api/schematic/FillSchematic.java
+++ b/src/api/java/baritone/api/schematic/FillSchematic.java
@@ -18,10 +18,9 @@
 package baritone.api.schematic;

 import baritone.api.utils.BlockOptionalMeta;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Blocks;
-
 import java.util.List;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;

 public class FillSchematic extends AbstractSchematic {

@@ -32,7 +31,7 @@ public class FillSchematic extends AbstractSchematic {
        this.bom = bom;
    }

-    public FillSchematic(int x, int y, int z, IBlockState state) {
+    public FillSchematic(int x, int y, int z, BlockState state) {
        this(x, y, z, new BlockOptionalMeta(state.getBlock()));
    }

@@ -41,13 +40,11 @@ public class FillSchematic extends AbstractSchematic {
    }

    @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
        if (bom.matches(current)) {
            return current;
-        } else if (current.getBlock() != Blocks.AIR) {
-            return Blocks.AIR.getDefaultState();
        }
-        for (IBlockState placeable : approxPlaceable) {
+        for (BlockState placeable : approxPlaceable) {
            if (bom.matches(placeable)) {
                return placeable;
            }
--- a/src/api/java/baritone/api/schematic/ISchematic.java
+++ b/src/api/java/baritone/api/schematic/ISchematic.java
@@ -17,10 +17,9 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.EnumFacing;
-
 import java.util.List;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.state.BlockState;

 /**
 * Basic representation of a schematic. Provides the dimensions and the desired state for a given position relative to
@@ -44,11 +43,11 @@ public interface ISchematic {
     * @param currentState The current state of that block in the world, or null
     * @return Whether or not the specified position is within the bounds of this schematic
     */
-    default boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    default boolean inSchematic(int x, int y, int z, BlockState currentState) {
        return x >= 0 && x < widthX() && y >= 0 && y < heightY() && z >= 0 && z < lengthZ();
    }

-    default int size(EnumFacing.Axis axis) {
+    default int size(Direction.Axis axis) {
        switch (axis) {
            case X:
                return widthX();
@@ -71,7 +70,12 @@ public interface ISchematic {
     * @param approxPlaceable The list of blockstates estimated to be placeable
     * @return The desired block state at the specified position
     */
-    IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable);
+    BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable);
+
+    /**
+     * Resets possible caches to avoid wrong behavior when moving the schematic around
+     */
+    default void reset() {}

    /**
     * @return The width (X axis length) of this schematic
--- a/src/api/java/baritone/api/schematic/IStaticSchematic.java
+++ b/src/api/java/baritone/api/schematic/IStaticSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
+import net.minecraft.world.level.block.state.BlockState;

 /**
 * A static schematic is capable of providing the desired state at a given position without
@@ -30,7 +30,7 @@ import net.minecraft.block.state.IBlockState;
 public interface IStaticSchematic extends ISchematic {

    /**
-     * Gets the {@link IBlockState} for a given position in this schematic. It should be guaranteed
+     * Gets the {@link BlockState} for a given position in this schematic. It should be guaranteed
     * that the return value of this method will not change given that the parameters are the same.
     *
     * @param x The X block position
@@ -38,19 +38,19 @@ public interface IStaticSchematic extends ISchematic {
     * @param z The Z block position
     * @return The desired state at the specified position.
     */
-    IBlockState getDirect(int x, int y, int z);
+    BlockState getDirect(int x, int y, int z);

    /**
-     * Returns an {@link IBlockState} array of size {@link #heightY()} which contains all
-     * desired block states in the specified vertical column. The index of {@link IBlockState}s
+     * Returns an {@link BlockState} array of size {@link #heightY()} which contains all
+     * desired block states in the specified vertical column. The index of {@link BlockState}s
     * in the array are equivalent to their Y position in the schematic.
     *
     * @param x The X column position
     * @param z The Z column position
-     * @return An {@link IBlockState} array
+     * @return An {@link BlockState} array
     */
-    default IBlockState[] getColumn(int x, int z) {
-        IBlockState[] column = new IBlockState[this.heightY()];
+    default BlockState[] getColumn(int x, int z) {
+        BlockState[] column = new BlockState[this.heightY()];
        for (int i = 0; i < this.heightY(); i++) {
            column[i] = getDirect(x, i, z);
        }
--- a/src/api/java/baritone/api/schematic/MaskSchematic.java
+++ b/src/api/java/baritone/api/schematic/MaskSchematic.java
@@ -17,9 +17,8 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
-
 import java.util.List;
+import net.minecraft.world.level.block.state.BlockState;

 public abstract class MaskSchematic extends AbstractSchematic {

@@ -30,15 +29,15 @@ public abstract class MaskSchematic extends AbstractSchematic {
        this.schematic = schematic;
    }

-    protected abstract boolean partOfMask(int x, int y, int z, IBlockState currentState);
+    protected abstract boolean partOfMask(int x, int y, int z, BlockState currentState);

    @Override
-    public boolean inSchematic(int x, int y, int z, IBlockState currentState) {
+    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
        return schematic.inSchematic(x, y, z, currentState) && partOfMask(x, y, z, currentState);
    }

    @Override
-    public IBlockState desiredState(int x, int y, int z, IBlockState current, List<IBlockState> approxPlaceable) {
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
        return schematic.desiredState(x, y, z, current, approxPlaceable);
    }
 }
--- a/src/api/java/baritone/api/schematic/ReplaceSchematic.java
+++ b/src/api/java/baritone/api/schematic/ReplaceSchematic.java
@@ -18,7 +18,7 @@
 package baritone.api.schematic;

 import baritone.api.utils.BlockOptionalMetaLookup;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.world.level.block.state.BlockState;

 public class ReplaceSchematic extends MaskSchematic {

@@ -32,7 +32,19 @@ public class ReplaceSchematic extends MaskSchematic {
    }

    @Override
-    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
+    public void reset() {
+        // it's final, can't use this.cache = new Boolean[widthX()][heightY()][lengthZ()]
+        for (int x = 0; x < cache.length; x++) {
+            for (int y = 0; y < cache[0].length; y++) {
+                for (int z = 0; z < cache[0][0].length; z++) {
+                    cache[x][y][z] = null;
+                }
+            }
+        }
+    }
+
+    @Override
+    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
        if (cache[x][y][z] == null) {
            cache[x][y][z] = filter.has(currentState);
        }
--- a/src/api/java/baritone/api/schematic/ShellSchematic.java
+++ b/src/api/java/baritone/api/schematic/ShellSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
+import net.minecraft.world.level.block.state.BlockState;

 public class ShellSchematic extends MaskSchematic {

@@ -26,7 +26,7 @@ public class ShellSchematic extends MaskSchematic {
    }

    @Override
-    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
        return x == 0 || y == 0 || z == 0 || x == widthX() - 1 || y == heightY() - 1 || z == lengthZ() - 1;
    }
 }
--- a/src/api/java/baritone/api/schematic/SubstituteSchematic.java
+++ b/src/api/java/baritone/api/schematic/SubstituteSchematic.java
@@ -0,0 +1,90 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.api.schematic;
+
+import net.minecraft.world.level.block.AirBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.Property;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SubstituteSchematic extends AbstractSchematic {
+
+    private final ISchematic schematic;
+    private final Map<Block, List<Block>> substitutions;
+    private final Map<BlockState, Map<Block, BlockState>> blockStateCache = new HashMap<>();
+
+    public SubstituteSchematic(ISchematic schematic, Map<Block,List<Block>> substitutions) {
+        super(schematic.widthX(), schematic.heightY(), schematic.lengthZ());
+        this.schematic = schematic;
+        this.substitutions = substitutions;
+    }
+
+    @Override
+    public boolean inSchematic(int x, int y, int z, BlockState currentState) {
+        return schematic.inSchematic(x, y, z, currentState);
+    }
+
+    @Override
+    public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
+        BlockState desired = schematic.desiredState(x, y, z, current, approxPlaceable);
+        Block desiredBlock = desired.getBlock();
+        if (!substitutions.containsKey(desiredBlock)) {
+            return desired;
+        }
+        List<Block> substitutes = substitutions.get(desiredBlock);
+        if (substitutes.contains(current.getBlock()) && !(current.getBlock() instanceof AirBlock)) {// don't preserve air, it's almost always there and almost never wanted
+            return withBlock(desired, current.getBlock());
+        }
+        for (Block substitute : substitutes) {
+            if (substitute instanceof AirBlock) {
+                return current.getBlock() instanceof AirBlock ? current : Blocks.AIR.defaultBlockState(); // can always "place" air
+            }
+            for (BlockState placeable : approxPlaceable) {
+                if (substitute.equals(placeable.getBlock())) {
+                    return withBlock(desired, placeable.getBlock());
+                }
+            }
+        }
+        return substitutes.get(0).defaultBlockState();
+    }
+
+    private BlockState withBlock(BlockState state, Block block) {
+        if (blockStateCache.containsKey(state) && blockStateCache.get(state).containsKey(block)) {
+            return blockStateCache.get(state).get(block);
+        }
+        Collection<Property<?>> properties = state.getProperties();
+        BlockState newState = block.defaultBlockState();
+        for (Property<?> property : properties) {
+            try {
+                newState = copySingleProp(state, newState, property);
+            } catch (IllegalArgumentException e) { //property does not exist for target block
+            }
+        }
+        blockStateCache.computeIfAbsent(state, s -> new HashMap<Block,BlockState>()).put(block, newState);
+        return newState;
+    }
+    private <T extends Comparable<T>> BlockState copySingleProp(BlockState fromState, BlockState toState, Property<T> prop) {
+        return toState.setValue(prop, fromState.getValue(prop));
+    }
+}
--- a/src/api/java/baritone/api/schematic/WallsSchematic.java
+++ b/src/api/java/baritone/api/schematic/WallsSchematic.java
@@ -17,7 +17,7 @@

 package baritone.api.schematic;

-import net.minecraft.block.state.IBlockState;
+import net.minecraft.world.level.block.state.BlockState;

 public class WallsSchematic extends MaskSchematic {

@@ -26,7 +26,7 @@ public class WallsSchematic extends MaskSchematic {
    }

    @Override
-    protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {
+    protected boolean partOfMask(int x, int y, int z, BlockState currentState) {
        return x == 0 || z == 0 || x == widthX() - 1 || z == lengthZ() - 1;
    }
 }
--- a/src/api/java/baritone/api/selection/ISelection.java
+++ b/src/api/java/baritone/api/selection/ISelection.java
@@ -18,9 +18,9 @@
 package baritone.api.selection;

 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.Vec3i;
+import net.minecraft.core.Direction;
+import net.minecraft.core.Vec3i;
+import net.minecraft.world.phys.AABB;

 /**
 * A selection is an immutable object representing the current selection. The selection is commonly used for certain
@@ -54,9 +54,9 @@ public interface ISelection {
    Vec3i size();

    /**
-     * @return An {@link AxisAlignedBB} encompassing all blocks in this selection.
+     * @return An {@link AABB} encompassing all blocks in this selection.
     */
-    AxisAlignedBB aabb();
+    AABB aabb();

    /**
     * Returns a new {@link ISelection} expanded in the specified direction by the specified number of blocks.
@@ -65,7 +65,7 @@ public interface ISelection {
     * @param blocks    How many blocks to expand it.
     * @return A new selection, expanded as specified.
     */
-    ISelection expand(EnumFacing direction, int blocks);
+    ISelection expand(Direction direction, int blocks);

    /**
     * Returns a new {@link ISelection} contracted in the specified direction by the specified number of blocks.
@@ -77,7 +77,7 @@ public interface ISelection {
     * @param blocks    How many blocks to contract it.
     * @return A new selection, contracted as specified.
     */
-    ISelection contract(EnumFacing direction, int blocks);
+    ISelection contract(Direction direction, int blocks);

    /**
     * Returns a new {@link ISelection} shifted in the specified direction by the specified number of blocks. This moves
@@ -87,5 +87,5 @@ public interface ISelection {
     * @param blocks    How many blocks to shift it.
     * @return A new selection, shifted as specified.
     */
-    ISelection shift(EnumFacing direction, int blocks);
+    ISelection shift(Direction direction, int blocks);
 }
--- a/src/api/java/baritone/api/selection/ISelectionManager.java
+++ b/src/api/java/baritone/api/selection/ISelectionManager.java
@@ -18,7 +18,7 @@
 package baritone.api.selection;

 import baritone.api.utils.BetterBlockPos;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.core.Direction;

 /**
 * The selection manager handles setting Baritone's selections. You can set the selection here, as well as retrieving
@@ -87,7 +87,7 @@ public interface ISelectionManager {
     * @param blocks    How many blocks to expand it.
     * @return The new selection, expanded as specified.
     */
-    ISelection expand(ISelection selection, EnumFacing direction, int blocks);
+    ISelection expand(ISelection selection, Direction direction, int blocks);

    /**
     * Replaces the specified {@link ISelection} with one contracted in the specified direction by the specified number
@@ -101,7 +101,7 @@ public interface ISelectionManager {
     * @param blocks    How many blocks to contract it.
     * @return The new selection, contracted as specified.
     */
-    ISelection contract(ISelection selection, EnumFacing direction, int blocks);
+    ISelection contract(ISelection selection, Direction direction, int blocks);

    /**
     * Replaces the specified {@link ISelection} with one shifted in the specified direction by the specified number of
@@ -112,5 +112,5 @@ public interface ISelectionManager {
     * @param blocks    How many blocks to shift it.
     * @return The new selection, shifted as specified.
     */
-    ISelection shift(ISelection selection, EnumFacing direction, int blocks);
+    ISelection shift(ISelection selection, Direction direction, int blocks);
 }
--- a/src/api/java/baritone/api/utils/BetterBlockPos.java
+++ b/src/api/java/baritone/api/utils/BetterBlockPos.java
@@ -17,12 +17,11 @@

 package baritone.api.utils;

-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.Vec3i;
-
 import javax.annotation.Nonnull;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.core.Vec3i;
+import net.minecraft.util.Mth;

 /**
 * A better BlockPos that has fewer hash collisions (and slightly more performant offsets)
@@ -49,7 +48,7 @@ public final class BetterBlockPos extends BlockPos {
    }

    public BetterBlockPos(double x, double y, double z) {
-        this(MathHelper.floor(x), MathHelper.floor(y), MathHelper.floor(z));
+        this(Mth.floor(x), Mth.floor(y), Mth.floor(z));
    }

    public BetterBlockPos(BlockPos pos) {
@@ -116,49 +115,49 @@ public final class BetterBlockPos extends BlockPos {
    }

    @Override
-    public BetterBlockPos up() {
+    public BetterBlockPos above() {
        // this is unimaginably faster than blockpos.up
        // that literally calls
        // this.up(1)
-        // which calls this.offset(EnumFacing.UP, 1)
+        // which calls this.offset(Direction.UP, 1)
        // which does return n == 0 ? this : new BlockPos(this.getX() + facing.getXOffset() * n, this.getY() + facing.getYOffset() * n, this.getZ() + facing.getZOffset() * n);

-        // how many function calls is that? up(), up(int), offset(EnumFacing, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
+        // how many function calls is that? up(), up(int), offset(Direction, int), new BlockPos, getX, getXOffset, getY, getYOffset, getZ, getZOffset
        // that's ten.
        // this is one function call.
        return new BetterBlockPos(x, y + 1, z);
    }

    @Override
-    public BetterBlockPos up(int amt) {
+    public BetterBlockPos above(int amt) {
        // see comment in up()
        return amt == 0 ? this : new BetterBlockPos(x, y + amt, z);
    }

    @Override
-    public BetterBlockPos down() {
+    public BetterBlockPos below() {
        // see comment in up()
        return new BetterBlockPos(x, y - 1, z);
    }

    @Override
-    public BetterBlockPos down(int amt) {
+    public BetterBlockPos below(int amt) {
        // see comment in up()
        return amt == 0 ? this : new BetterBlockPos(x, y - amt, z);
    }

    @Override
-    public BetterBlockPos offset(EnumFacing dir) {
-        Vec3i vec = dir.getDirectionVec();
+    public BetterBlockPos relative(Direction dir) {
+        Vec3i vec = dir.getNormal();
        return new BetterBlockPos(x + vec.getX(), y + vec.getY(), z + vec.getZ());
    }

    @Override
-    public BetterBlockPos offset(EnumFacing dir, int dist) {
+    public BetterBlockPos relative(Direction dir, int dist) {
        if (dist == 0) {
            return this;
        }
-        Vec3i vec = dir.getDirectionVec();
+        Vec3i vec = dir.getNormal();
        return new BetterBlockPos(x + vec.getX() * dist, y + vec.getY() * dist, z + vec.getZ() * dist);
    }

--- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java
@@ -19,15 +19,31 @@ package baritone.api.utils;

 import baritone.api.utils.accessor.IItemStack;
 import com.google.common.collect.ImmutableSet;
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.IRegistry;
-
+import io.netty.util.concurrent.ThreadPerTaskExecutor;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.*;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.packs.PackResources;
+import net.minecraft.server.packs.PackType;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.server.packs.repository.PackRepository;
+import net.minecraft.server.packs.repository.ServerPacksSource;
+import net.minecraft.server.packs.resources.ReloadableResourceManager;
+import net.minecraft.util.Unit;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.loot.BuiltInLootTables;
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.LootTables;
+import net.minecraft.world.level.storage.loot.PredicateManager;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
+import net.minecraft.world.phys.Vec3;
 import javax.annotation.Nonnull;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -35,10 +51,13 @@ import java.util.regex.Pattern;
 public final class BlockOptionalMeta {

    private final Block block;
-    private final Set<IBlockState> blockstates;
+    private final Set<BlockState> blockstates;
    private final ImmutableSet<Integer> stateHashes;
    private final ImmutableSet<Integer> stackHashes;
    private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
+    private static LootTables manager;
+    private static PredicateManager predicate = new PredicateManager();
+    private static Map<Block, List<Item>> drops = new HashMap<>();

    public BlockOptionalMeta(@Nonnull Block block) {
        this.block = block;
@@ -56,38 +75,32 @@ public final class BlockOptionalMeta {

        MatchResult matchResult = matcher.toMatchResult();

-        ResourceLocation id = new ResourceLocation(matchResult.group(1));
-
-        if (!IRegistry.BLOCK.containsKey(id)) {
-            throw new IllegalArgumentException("Invalid block ID");
-        }
-
-        block = IRegistry.BLOCK.get(id);
+        block = BlockUtils.stringToBlockRequired(matchResult.group(1));
        blockstates = getStates(block);
        stateHashes = getStateHashes(blockstates);
        stackHashes = getStackHashes(blockstates);
    }

-    private static Set<IBlockState> getStates(@Nonnull Block block) {
-        return new HashSet<>(block.getStateContainer().getValidStates());
+    private static Set<BlockState> getStates(@Nonnull Block block) {
+        return new HashSet<>(block.getStateDefinition().getPossibleStates());
    }

-    private static ImmutableSet<Integer> getStateHashes(Set<IBlockState> blockstates) {
+    private static ImmutableSet<Integer> getStateHashes(Set<BlockState> blockstates) {
        return ImmutableSet.copyOf(
                blockstates.stream()
-                        .map(IBlockState::hashCode)
+                        .map(BlockState::hashCode)
                        .toArray(Integer[]::new)
        );
    }

-    private static ImmutableSet<Integer> getStackHashes(Set<IBlockState> blockstates) {
+    private static ImmutableSet<Integer> getStackHashes(Set<BlockState> blockstates) {
        //noinspection ConstantConditions
        return ImmutableSet.copyOf(
                blockstates.stream()
-                        .map(state -> new ItemStack(
-                                state.getBlock().getItemDropped(state, null, null, 0).asItem(),
-                                1
-                        ))
+                        .flatMap(state -> drops(state.getBlock())
+                                .stream()
+                                .map(item -> new ItemStack(item, 1))
+                        )
                        .map(stack -> ((IItemStack) (Object) stack).getBaritoneHash())
                        .toArray(Integer[]::new)
        );
@@ -101,7 +114,7 @@ public final class BlockOptionalMeta {
        return block == this.block;
    }

-    public boolean matches(@Nonnull IBlockState blockstate) {
+    public boolean matches(@Nonnull BlockState blockstate) {
        Block block = blockstate.getBlock();
        return block == this.block && stateHashes.contains(blockstate.hashCode());
    }
@@ -110,7 +123,7 @@ public final class BlockOptionalMeta {
        //noinspection ConstantConditions
        int hash = ((IItemStack) (Object) stack).getBaritoneHash();

-        hash -= stack.getDamage();
+        hash -= stack.getDamageValue();

        return stackHashes.contains(hash);
    }
@@ -120,11 +133,56 @@ public final class BlockOptionalMeta {
        return String.format("BlockOptionalMeta{block=%s}", block);
    }

-    public IBlockState getAnyBlockState() {
+    public BlockState getAnyBlockState() {
        if (blockstates.size() > 0) {
            return blockstates.iterator().next();
        }

        return null;
    }
+
+    public static LootTables getManager() {
+        if (manager == null) {
+            PackRepository rpl = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource());
+            rpl.reload();
+            PackResources thePack = rpl.getAvailablePacks().iterator().next().open();
+            ReloadableResourceManager resourceManager = new ReloadableResourceManager(PackType.SERVER_DATA);
+            manager = new LootTables(predicate);
+            resourceManager.registerReloadListener(manager);
+            try {
+                resourceManager.createReload(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), CompletableFuture.completedFuture(Unit.INSTANCE), Collections.singletonList(thePack)).done().get();
+            } catch (Exception exception) {
+                throw new RuntimeException(exception);
+            }
+        }
+        return manager;
+    }
+
+    public static PredicateManager getPredicateManager() {
+        return predicate;
+    }
+
+    private static synchronized List<Item> drops(Block b) {
+        return drops.computeIfAbsent(b, block -> {
+            ResourceLocation lootTableLocation = block.getLootTable();
+            if (lootTableLocation == BuiltInLootTables.EMPTY) {
+                return Collections.emptyList();
+            } else {
+                List<Item> items = new ArrayList<>();
+
+                // the other overload for generate doesnt work in forge because forge adds code that requires a non null world
+                getManager().get(lootTableLocation).getRandomItems(
+                        new LootContext.Builder((ServerLevel) null)
+                                .withRandom(new Random())
+                                .withParameter(LootContextParams.ORIGIN, Vec3.atLowerCornerOf(BlockPos.ZERO))
+                                .withParameter(LootContextParams.TOOL, ItemStack.EMPTY)
+                                .withOptionalParameter(LootContextParams.BLOCK_ENTITY, null)
+                                .withParameter(LootContextParams.BLOCK_STATE, block.defaultBlockState())
+                                .create(LootContextParamSets.BLOCK),
+                        stack -> items.add(stack.getItem())
+                );
+                return items;
+            }
+        });
+    }
 }
--- a/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
+++ b/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java
@@ -17,13 +17,12 @@

 package baritone.api.utils;

-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.item.ItemStack;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;

 public class BlockOptionalMetaLookup {

@@ -61,7 +60,7 @@ public class BlockOptionalMetaLookup {
        return false;
    }

-    public boolean has(IBlockState state) {
+    public boolean has(BlockState state) {
        for (BlockOptionalMeta bom : boms) {
            if (bom.matches(state)) {
                return true;
--- a/src/api/java/baritone/api/utils/BlockUtils.java
+++ b/src/api/java/baritone/api/utils/BlockUtils.java
@@ -17,19 +17,18 @@

 package baritone.api.utils;

-import net.minecraft.block.Block;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.IRegistry;
-
 import java.util.HashMap;
 import java.util.Map;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;

 public class BlockUtils {

    private static transient Map<String, Block> resourceCache = new HashMap<>();

    public static String blockToString(Block block) {
-        ResourceLocation loc = IRegistry.BLOCK.getKey(block);
+        ResourceLocation loc = Registry.BLOCK.getKey(block);
        String name = loc.getPath(); // normally, only write the part after the minecraft:
        if (!loc.getNamespace().equals("minecraft")) {
            // Baritone is running on top of forge with mods installed, perhaps?
@@ -57,7 +56,7 @@ public class BlockUtils {
        if (resourceCache.containsKey(name)) {
            return null; // cached as null
        }
-        block = IRegistry.BLOCK.get(ResourceLocation.tryCreate(name.contains(":") ? name : "minecraft:" + name));
+        block = Registry.BLOCK.getOptional(ResourceLocation.tryParse(name.contains(":") ? name : "minecraft:" + name)).orElse(null);
        Map<String, Block> copy = new HashMap<>(resourceCache); // read only copy is safe, wont throw concurrentmodification
        copy.put(name, block);
        resourceCache = copy;
--- a/src/api/java/baritone/api/utils/Helper.java
+++ b/src/api/java/baritone/api/utils/Helper.java
@@ -19,11 +19,11 @@ package baritone.api.utils;

 import baritone.api.BaritoneAPI;
 import baritone.api.utils.gui.BaritoneToast;
+import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextFormatting;
-
+import net.minecraft.network.chat.BaseComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.stream.Stream;
@@ -47,19 +47,19 @@ public interface Helper {
     */
    Minecraft mc = Minecraft.getInstance();

-    static ITextComponent getPrefix() {
+    static Component getPrefix() {
        // Inner text component
        final Calendar now = Calendar.getInstance();
        final boolean xd = now.get(Calendar.MONTH) == Calendar.APRIL && now.get(Calendar.DAY_OF_MONTH) <= 3;
-        ITextComponent baritone = new TextComponentString(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
-        baritone.getStyle().setColor(TextFormatting.LIGHT_PURPLE);
+        BaseComponent baritone = new TextComponent(xd ? "Baritoe" : BaritoneAPI.getSettings().shortBaritonePrefix.value ? "B" : "Baritone");
+        baritone.setStyle(baritone.getStyle().withColor(ChatFormatting.LIGHT_PURPLE));

        // Outer brackets
-        ITextComponent prefix = new TextComponentString("");
-        prefix.getStyle().setColor(TextFormatting.DARK_PURPLE);
-        prefix.appendText("[");
-        prefix.appendSibling(baritone);
-        prefix.appendText("]");
+        BaseComponent prefix = new TextComponent("");
+        prefix.setStyle(baritone.getStyle().withColor(ChatFormatting.DARK_PURPLE));
+        prefix.append("[");
+        prefix.append(baritone);
+        prefix.append("]");

        return prefix;
    }
@@ -70,8 +70,8 @@ public interface Helper {
     * @param title   The title to display in the popup
     * @param message The message to display in the popup
     */
-    default void logToast(ITextComponent title, ITextComponent message) {
-        mc.addScheduledTask(() -> BaritoneToast.addOrUpdate(mc.getToastGui(), title, message, BaritoneAPI.getSettings().toastTimer.value));
+    default void logToast(Component title, Component message) {
+        mc.execute(() -> BaritoneAPI.getSettings().toaster.value.accept(title, message));
    }

    /**
@@ -81,7 +81,7 @@ public interface Helper {
     * @param message The message to display in the popup
     */
    default void logToast(String title, String message) {
-        logToast(new TextComponentString(title), new TextComponentString(message));
+        logToast(new TextComponent(title), new TextComponent(message));
    }

    /**
@@ -90,7 +90,49 @@ public interface Helper {
     * @param message The message to display in the popup
     */
    default void logToast(String message) {
-        logToast(Helper.getPrefix(), new TextComponentString(message));
+        logToast(Helper.getPrefix(), new TextComponent(message));
+    }
+
+    /**
+     * Send a message as a desktop notification
+     *
+     * @param message The message to display in the notification
+     */
+    default void logNotification(String message) {
+        logNotification(message, false);
+    }
+
+    /**
+     * Send a message as a desktop notification
+     *
+     * @param message The message to display in the notification
+     * @param error   Whether to log as an error
+     */
+    default void logNotification(String message, boolean error) {
+        if (BaritoneAPI.getSettings().desktopNotifications.value) {
+            logNotificationDirect(message, error);
+        }
+    }
+
+    /**
+     * Send a message as a desktop notification regardless of desktopNotifications
+     * (should only be used for critically important messages)
+     *
+     * @param message The message to display in the notification
+     */
+    default void logNotificationDirect(String message) {
+        logNotificationDirect(message, false);
+    }
+
+    /**
+     * Send a message as a desktop notification regardless of desktopNotifications
+     * (should only be used for critically important messages)
+     *
+     * @param message The message to display in the notification
+     * @param error   Whether to log as an error
+     */
+    default void logNotificationDirect(String message, boolean error) {
+        mc.execute(() -> BaritoneAPI.getSettings().notifier.value.accept(message, error));
    }

    /**
@@ -115,19 +157,15 @@ public interface Helper {
     * @param logAsToast Whether to log as a toast notification
     * @param components The components to send
     */
-    default void logDirect(boolean logAsToast, ITextComponent... components) {
-        ITextComponent component = new TextComponentString("");
-        if (!logAsToast) {
-            // If we are not logging as a Toast
-            // Append the prefix to the base component line
-            component.appendSibling(getPrefix());
-            component.appendSibling(new TextComponentString(" "));
-        }
-        Arrays.asList(components).forEach(component::appendSibling);
+    default void logDirect(boolean logAsToast, Component... components) {
+        BaseComponent component = new TextComponent("");
+        component.append(getPrefix());
+        component.append(new TextComponent(" "));
+        Arrays.asList(components).forEach(component::append);
        if (logAsToast) {
            logToast(getPrefix(), component);
        } else {
-            mc.addScheduledTask(() -> BaritoneAPI.getSettings().logger.value.accept(component));
+            mc.execute(() -> BaritoneAPI.getSettings().logger.value.accept(component));
        }
    }

@@ -136,7 +174,7 @@ public interface Helper {
     *
     * @param components The components to send
     */
-    default void logDirect(ITextComponent... components) {
+    default void logDirect(Component... components) {
        logDirect(BaritoneAPI.getSettings().logAsToast.value, components);
    }

@@ -148,10 +186,10 @@ public interface Helper {
     * @param color      The color to print that message in
     * @param logAsToast Whether to log as a toast notification
     */
-    default void logDirect(String message, TextFormatting color, boolean logAsToast) {
+    default void logDirect(String message, ChatFormatting color, boolean logAsToast) {
        Stream.of(message.split("\n")).forEach(line -> {
-            ITextComponent component = new TextComponentString(line.replace("\t", "    "));
-            component.getStyle().setColor(color);
+            BaseComponent component = new TextComponent(line.replace("\t", "    "));
+            component.setStyle(component.getStyle().withColor(color));
            logDirect(logAsToast, component);
        });
    }
@@ -163,7 +201,7 @@ public interface Helper {
     * @param message The message to display in chat
     * @param color   The color to print that message in
     */
-    default void logDirect(String message, TextFormatting color) {
+    default void logDirect(String message, ChatFormatting color) {
        logDirect(message, color, BaritoneAPI.getSettings().logAsToast.value);
    }

@@ -175,7 +213,7 @@ public interface Helper {
     * @param logAsToast Whether to log as a toast notification
     */
    default void logDirect(String message, boolean logAsToast) {
-        logDirect(message, TextFormatting.GRAY, logAsToast);
+        logDirect(message, ChatFormatting.GRAY, logAsToast);
    }

    /**
--- a/src/api/java/baritone/api/utils/IPlayerContext.java
+++ b/src/api/java/baritone/api/utils/IPlayerContext.java
@@ -18,14 +18,18 @@
 package baritone.api.utils;

 import baritone.api.cache.IWorldData;
-import net.minecraft.block.BlockSlab;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-
 import java.util.Optional;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.SlabBlock;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;

 /**
 * @author Brady
@@ -33,19 +37,28 @@ import java.util.Optional;
 */
 public interface IPlayerContext {

-    EntityPlayerSP player();
+    LocalPlayer player();

    IPlayerController playerController();

-    World world();
+    Level world();
+
+    default Iterable<Entity> entities() {
+        return ((ClientLevel) world()).entitiesForRendering();
+    }
+
+    default Stream<Entity> entitiesStream() {
+        return StreamSupport.stream(entities().spliterator(), false);
+    }
+

    IWorldData worldData();

-    RayTraceResult objectMouseOver();
+    HitResult objectMouseOver();

    default BetterBlockPos playerFeet() {
        // TODO find a better way to deal with soul sand!!!!!
-        BetterBlockPos feet = new BetterBlockPos(player().posX, player().posY + 0.1251, player().posZ);
+        BetterBlockPos feet = new BetterBlockPos(player().position().x, player().position().y + 0.1251, player().position().z);

        // sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
        // that causes the game to immediately crash
@@ -56,28 +69,28 @@ public interface IPlayerContext {
        // this does not impact performance at all since we're not null checking constantly
        // if there is an exception, the only overhead is Java generating the exception object... so we can ignore it
        try {
-            if (world().getBlockState(feet).getBlock() instanceof BlockSlab) {
-                return feet.up();
+            if (world().getBlockState(feet).getBlock() instanceof SlabBlock) {
+                return feet.above();
            }
        } catch (NullPointerException ignored) {}

        return feet;
    }

-    default Vec3d playerFeetAsVec() {
-        return new Vec3d(player().posX, player().posY, player().posZ);
+    default Vec3 playerFeetAsVec() {
+        return new Vec3(player().position().x, player().position().y, player().position().z);
    }

-    default Vec3d playerHead() {
-        return new Vec3d(player().posX, player().posY + player().getEyeHeight(), player().posZ);
+    default Vec3 playerHead() {
+        return new Vec3(player().position().x, player().position().y + player().getEyeHeight(), player().position().z);
    }

    default Rotation playerRotations() {
-        return new Rotation(player().rotationYaw, player().rotationPitch);
+        return new Rotation(player().getYRot(), player().getXRot());
    }

    static double eyeHeight(boolean ifSneaking) {
-        return ifSneaking ? 1.54 : 1.62;
+        return ifSneaking ? 1.27 : 1.62;
    }

    /**
@@ -86,9 +99,9 @@ public interface IPlayerContext {
     * @return The position of the highlighted block
     */
    default Optional<BlockPos> getSelectedBlock() {
-        RayTraceResult result = objectMouseOver();
-        if (result != null && result.type == RayTraceResult.Type.BLOCK) {
-            return Optional.of(result.getBlockPos());
+        HitResult result = objectMouseOver();
+        if (result != null && result.getType() == HitResult.Type.BLOCK) {
+            return Optional.of(((BlockHitResult) result).getBlockPos());
        }
        return Optional.empty();
    }
--- a/src/api/java/baritone/api/utils/IPlayerController.java
+++ b/src/api/java/baritone/api/utils/IPlayerController.java
@@ -18,17 +18,16 @@
 package baritone.api.utils;

 import baritone.api.BaritoneAPI;
-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;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.ClickType;
+import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.BlockHitResult;

 /**
 * @author Brady
@@ -40,19 +39,19 @@ public interface IPlayerController {

    boolean hasBrokenBlock();

-    boolean onPlayerDamageBlock(BlockPos pos, EnumFacing side);
+    boolean onPlayerDamageBlock(BlockPos pos, Direction side);

    void resetBlockRemoving();

-    ItemStack windowClick(int windowId, int slotId, int mouseButton, ClickType type, EntityPlayer player);
+    void windowClick(int windowId, int slotId, int mouseButton, ClickType type, Player player);

    GameType getGameType();

-    EnumActionResult processRightClickBlock(EntityPlayerSP player, World world, BlockPos pos, EnumFacing direction, Vec3d vec, EnumHand hand);
+    InteractionResult processRightClickBlock(LocalPlayer player, Level world, InteractionHand hand, BlockHitResult result);

-    EnumActionResult processRightClick(EntityPlayerSP player, World world, EnumHand hand);
+    InteractionResult processRightClick(LocalPlayer player, Level world, InteractionHand hand);

-    boolean clickBlock(BlockPos loc, EnumFacing face);
+    boolean clickBlock(BlockPos loc, Direction face);

    void setHittingBlock(boolean hittingBlock);

--- a/src/api/java/baritone/api/utils/NotificationHelper.java
+++ b/src/api/java/baritone/api/utils/NotificationHelper.java
@@ -15,7 +15,7 @@
 * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
 */

-package baritone.utils;
+package baritone.api.utils;

 import org.apache.commons.lang3.SystemUtils;

--- a/src/api/java/baritone/api/utils/RayTraceUtils.java
+++ b/src/api/java/baritone/api/utils/RayTraceUtils.java
@@ -17,10 +17,10 @@

 package baritone.api.utils;

-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.RayTraceFluidMode;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.ClipContext;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;

 /**
 * @author Brady
@@ -40,27 +40,27 @@ public final class RayTraceUtils {
     * @param blockReachDistance The block reach distance of the entity
     * @return The calculated raytrace result
     */
-    public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
+    public static HitResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance) {
        return rayTraceTowards(entity, rotation, blockReachDistance, false);
    }

-    public static RayTraceResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
-        Vec3d start;
+    public static HitResult rayTraceTowards(Entity entity, Rotation rotation, double blockReachDistance, boolean wouldSneak) {
+        Vec3 start;
        if (wouldSneak) {
            start = inferSneakingEyePosition(entity);
        } else {
            start = entity.getEyePosition(1.0F); // do whatever is correct
        }
-        Vec3d direction = RotationUtils.calcVec3dFromRotation(rotation);
-        Vec3d end = start.add(
+        Vec3 direction = RotationUtils.calcVector3dFromRotation(rotation);
+        Vec3 end = start.add(
                direction.x * blockReachDistance,
                direction.y * blockReachDistance,
                direction.z * blockReachDistance
        );
-        return entity.world.rayTraceBlocks(start, end, RayTraceFluidMode.NEVER, false, true);
+        return entity.level.clip(new ClipContext(start, end, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, entity));
    }

-    public static Vec3d inferSneakingEyePosition(Entity entity) {
-        return new Vec3d(entity.posX, entity.posY + IPlayerContext.eyeHeight(true), entity.posZ);
+    public static Vec3 inferSneakingEyePosition(Entity entity) {
+        return new Vec3(entity.getX(), entity.getY() + IPlayerContext.eyeHeight(true), entity.getZ());
    }
 }
--- a/src/api/java/baritone/api/utils/RotationUtils.java
+++ b/src/api/java/baritone/api/utils/RotationUtils.java
@@ -19,19 +19,19 @@ package baritone.api.utils;

 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import net.minecraft.block.BlockFire;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.shapes.VoxelShapes;
-
 import java.util.Optional;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.block.BaseFireBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.VoxelShape;

 /**
 * @author Brady
@@ -52,13 +52,13 @@ public final class RotationUtils {
    /**
     * Offsets from the root block position to the center of each side.
     */
-    private static final Vec3d[] BLOCK_SIDE_MULTIPLIERS = new Vec3d[]{
-            new Vec3d(0.5, 0, 0.5), // Down
-            new Vec3d(0.5, 1, 0.5), // Up
-            new Vec3d(0.5, 0.5, 0), // North
-            new Vec3d(0.5, 0.5, 1), // South
-            new Vec3d(0, 0.5, 0.5), // West
-            new Vec3d(1, 0.5, 0.5)  // East
+    private static final Vec3[] BLOCK_SIDE_MULTIPLIERS = new Vec3[]{
+            new Vec3(0.5, 0, 0.5), // Down
+            new Vec3(0.5, 1, 0.5), // Up
+            new Vec3(0.5, 0.5, 0), // North
+            new Vec3(0.5, 0.5, 1), // South
+            new Vec3(0, 0.5, 0.5), // West
+            new Vec3(1, 0.5, 0.5)  // East
    };

    private RotationUtils() {}
@@ -71,7 +71,7 @@ public final class RotationUtils {
     * @return The rotation from the origin to the destination
     */
    public static Rotation calcRotationFromCoords(BlockPos orig, BlockPos dest) {
-        return calcRotationFromVec3d(new Vec3d(orig), new Vec3d(dest));
+        return calcRotationFromVec3d(new Vec3(orig.getX(), orig.getY(), orig.getZ()), new Vec3(dest.getX(), dest.getY(), dest.getZ()));
    }

    /**
@@ -100,7 +100,7 @@ public final class RotationUtils {
     * @return The rotation from the origin to the destination
     * @see #wrapAnglesToRelative(Rotation, Rotation)
     */
-    public static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest, Rotation current) {
+    public static Rotation calcRotationFromVec3d(Vec3 orig, Vec3 dest, Rotation current) {
        return wrapAnglesToRelative(current, calcRotationFromVec3d(orig, dest));
    }

@@ -111,11 +111,11 @@ public final class RotationUtils {
     * @param dest The destination position
     * @return The rotation from the origin to the destination
     */
-    private static Rotation calcRotationFromVec3d(Vec3d orig, Vec3d dest) {
+    private static Rotation calcRotationFromVec3d(Vec3 orig, Vec3 dest) {
        double[] delta = {orig.x - dest.x, orig.y - dest.y, orig.z - dest.z};
-        double yaw = MathHelper.atan2(delta[0], -delta[2]);
+        double yaw = Mth.atan2(delta[0], -delta[2]);
        double dist = Math.sqrt(delta[0] * delta[0] + delta[2] * delta[2]);
-        double pitch = MathHelper.atan2(delta[1], dist);
+        double pitch = Mth.atan2(delta[1], dist);
        return new Rotation(
                (float) (yaw * RAD_TO_DEG),
                (float) (pitch * RAD_TO_DEG)
@@ -128,19 +128,19 @@ public final class RotationUtils {
     * @param rotation The input rotation
     * @return Look vector for the rotation
     */
-    public static Vec3d calcVec3dFromRotation(Rotation rotation) {
-        float f = MathHelper.cos(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
-        float f1 = MathHelper.sin(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
-        float f2 = -MathHelper.cos(-rotation.getPitch() * (float) DEG_TO_RAD);
-        float f3 = MathHelper.sin(-rotation.getPitch() * (float) DEG_TO_RAD);
-        return new Vec3d((double) (f1 * f2), (double) f3, (double) (f * f2));
+    public static Vec3 calcVector3dFromRotation(Rotation rotation) {
+        float f = Mth.cos(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f1 = Mth.sin(-rotation.getYaw() * (float) DEG_TO_RAD - (float) Math.PI);
+        float f2 = -Mth.cos(-rotation.getPitch() * (float) DEG_TO_RAD);
+        float f3 = Mth.sin(-rotation.getPitch() * (float) DEG_TO_RAD);
+        return new Vec3((double) (f1 * f2), (double) f3, (double) (f * f2));
    }

    /**
     * @param ctx Context for the viewing entity
     * @param pos The target block position
     * @return The optional rotation
-     * @see #reachable(EntityPlayerSP, BlockPos, double)
+     * @see #reachable(LocalPlayer, BlockPos, double)
     */
    public static Optional<Rotation> reachable(IPlayerContext ctx, BlockPos pos) {
        return reachable(ctx.player(), pos, ctx.playerController().getBlockReachDistance());
@@ -162,11 +162,11 @@ public final class RotationUtils {
     * @param blockReachDistance The block reach distance of the entity
     * @return The optional rotation
     */
-    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance) {
+    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance) {
        return reachable(entity, pos, blockReachDistance, false);
    }

-    public static Optional<Rotation> reachable(EntityPlayerSP entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
+    public static Optional<Rotation> reachable(LocalPlayer entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(entity);
        if (baritone.getPlayerContext().isLookingAt(pos)) {
            /*
@@ -179,11 +179,11 @@ public final class RotationUtils {
             *
             * or if you're a normal person literally all this does it ensure that we don't nudge the pitch to a normal level
             */
-            Rotation hypothetical = new Rotation(entity.rotationYaw, entity.rotationPitch + 0.0001F);
+            Rotation hypothetical = new Rotation(entity.getYRot(), entity.getXRot() + 0.0001F);
            if (wouldSneak) {
                // the concern here is: what if we're looking at it now, but as soon as we start sneaking we no longer are
-                RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, hypothetical, blockReachDistance, true);
-                if (result != null && result.type == RayTraceResult.Type.BLOCK && result.getBlockPos().equals(pos)) {
+                HitResult result = RayTraceUtils.rayTraceTowards(entity, hypothetical, blockReachDistance, true);
+                if (result != null && result.getType() == HitResult.Type.BLOCK && ((BlockHitResult) result).getBlockPos().equals(pos)) {
                    return Optional.of(hypothetical); // yes, if we sneaked we would still be looking at the block
                }
            } else {
@@ -196,16 +196,16 @@ public final class RotationUtils {
            return possibleRotation;
        }

-        IBlockState state = entity.world.getBlockState(pos);
-        VoxelShape shape = state.getShape(entity.world, pos);
+        BlockState state = entity.level.getBlockState(pos);
+        VoxelShape shape = state.getShape(entity.level, pos);
        if (shape.isEmpty()) {
-            shape = VoxelShapes.fullCube();
+            shape = Shapes.block();
        }
-        for (Vec3d sideOffset : BLOCK_SIDE_MULTIPLIERS) {
-            double xDiff = shape.getStart(EnumFacing.Axis.X) * sideOffset.x + shape.getEnd(EnumFacing.Axis.X) * (1 - sideOffset.x);
-            double yDiff = shape.getStart(EnumFacing.Axis.Y) * sideOffset.y + shape.getEnd(EnumFacing.Axis.Y) * (1 - sideOffset.y);
-            double zDiff = shape.getStart(EnumFacing.Axis.Z) * sideOffset.z + shape.getEnd(EnumFacing.Axis.Z) * (1 - sideOffset.z);
-            possibleRotation = reachableOffset(entity, pos, new Vec3d(pos).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
+        for (Vec3 sideOffset : BLOCK_SIDE_MULTIPLIERS) {
+            double xDiff = shape.min(Direction.Axis.X) * sideOffset.x + shape.max(Direction.Axis.X) * (1 - sideOffset.x);
+            double yDiff = shape.min(Direction.Axis.Y) * sideOffset.y + shape.max(Direction.Axis.Y) * (1 - sideOffset.y);
+            double zDiff = shape.min(Direction.Axis.Z) * sideOffset.z + shape.max(Direction.Axis.Z) * (1 - sideOffset.z);
+            possibleRotation = reachableOffset(entity, pos, new Vec3(pos.getX(), pos.getY(), pos.getZ()).add(xDiff, yDiff, zDiff), blockReachDistance, wouldSneak);
            if (possibleRotation.isPresent()) {
                return possibleRotation;
            }
@@ -224,16 +224,16 @@ public final class RotationUtils {
     * @param blockReachDistance The block reach distance of the entity
     * @return The optional rotation
     */
-    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3d offsetPos, double blockReachDistance, boolean wouldSneak) {
-        Vec3d eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
-        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.rotationYaw, entity.rotationPitch));
-        RayTraceResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
+    public static Optional<Rotation> reachableOffset(Entity entity, BlockPos pos, Vec3 offsetPos, double blockReachDistance, boolean wouldSneak) {
+        Vec3 eyes = wouldSneak ? RayTraceUtils.inferSneakingEyePosition(entity) : entity.getEyePosition(1.0F);
+        Rotation rotation = calcRotationFromVec3d(eyes, offsetPos, new Rotation(entity.getYRot(), entity.getXRot()));
+        HitResult result = RayTraceUtils.rayTraceTowards(entity, rotation, blockReachDistance, wouldSneak);
        //System.out.println(result);
-        if (result != null && result.type == RayTraceResult.Type.BLOCK) {
-            if (result.getBlockPos().equals(pos)) {
+        if (result != null && result.getType() == HitResult.Type.BLOCK) {
+            if (((BlockHitResult) result).getBlockPos().equals(pos)) {
                return Optional.of(rotation);
            }
-            if (entity.world.getBlockState(pos).getBlock() instanceof BlockFire && result.getBlockPos().equals(pos.down())) {
+            if (entity.level.getBlockState(pos).getBlock() instanceof BaseFireBlock && ((BlockHitResult) result).getBlockPos().equals(pos.below())) {
                return Optional.of(rotation);
            }
        }
@@ -250,6 +250,6 @@ public final class RotationUtils {
     * @return The optional rotation
     */
    public static Optional<Rotation> reachableCenter(Entity entity, BlockPos pos, double blockReachDistance, boolean wouldSneak) {
-        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.world, pos), blockReachDistance, wouldSneak);
+        return reachableOffset(entity, pos, VecUtils.calculateBlockCenter(entity.level, pos), blockReachDistance, wouldSneak);
    }
 }
--- a/src/api/java/baritone/api/utils/SettingsUtil.java
+++ b/src/api/java/baritone/api/utils/SettingsUtil.java
@@ -19,14 +19,13 @@ package baritone.api.utils;

 import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.item.Item;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.Vec3i;
-import net.minecraft.util.registry.IRegistry;
-
+import net.minecraft.core.Direction;
+import net.minecraft.core.Registry;
+import net.minecraft.core.Vec3i;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 import java.awt.*;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -38,6 +37,7 @@ import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -49,8 +49,9 @@ import java.util.stream.Stream;

 public class SettingsUtil {

-    private static final Path SETTINGS_PATH = Minecraft.getInstance().gameDir.toPath().resolve("baritone").resolve("settings.txt");
+    private static final Path SETTINGS_PATH = Minecraft.getInstance().gameDirectory.toPath().resolve("baritone").resolve("settings.txt");
    private static final Pattern SETTING_PATTERN = Pattern.compile("^(?<setting>[^ ]+) +(?<value>.+)"); // key and value split by the first space
+    private static final String[] JAVA_ONLY_SETTINGS = {"logger", "notifier", "toaster"};


    private static boolean isComment(String line) {
@@ -113,7 +114,7 @@ public class SettingsUtil {
                System.out.println("NULL SETTING?" + setting.getName());
                continue;
            }
-            if (setting.getName().equals("logger")) {
+            if (javaOnlySetting(setting)) {
                continue; // NO
            }
            if (setting.value == setting.defaultValue) {
@@ -167,13 +168,28 @@ public class SettingsUtil {
    }

    public static String settingToString(Settings.Setting setting) throws IllegalStateException {
-        if (setting.getName().equals("logger")) {
-            return "logger";
+        if (javaOnlySetting(setting)) {
+            return setting.getName();
        }

        return setting.getName() + " " + settingValueToString(setting);
    }

+    /**
+     * This should always be the same as whether the setting can be parsed from or serialized to a string
+     *
+     * @param the setting
+     * @return true if the setting can not be set or read by the user
+     */
+    public static boolean javaOnlySetting(Settings.Setting setting) {
+        for (String name : JAVA_ONLY_SETTINGS) { // no JAVA_ONLY_SETTINGS.contains(...) because that would be case sensitive
+            if (setting.getName().equalsIgnoreCase(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
    public static void parseAndApply(Settings settings, String settingName, String settingValue) throws IllegalStateException, NumberFormatException {
        Settings.Setting setting = settings.byLowerName.get(settingName);
        if (setting == null) {
@@ -218,7 +234,7 @@ public class SettingsUtil {
        FLOAT(Float.class, Float::parseFloat),
        LONG(Long.class, Long::parseLong),
        STRING(String.class, String::new),
-        ENUMFACING(EnumFacing.class, EnumFacing::byName),
+        DIRECTION(Direction.class, Direction::byName),
        COLOR(
                Color.class,
                str -> new Color(Integer.parseInt(str.split(",")[0]), Integer.parseInt(str.split(",")[1]), Integer.parseInt(str.split(",")[2])),
@@ -236,8 +252,8 @@ public class SettingsUtil {
        ),
        ITEM(
                Item.class,
-                str -> IRegistry.ITEM.get(new ResourceLocation(str.trim())),
-                item -> IRegistry.ITEM.getKey(item).toString()
+                str -> Registry.ITEM.get(new ResourceLocation(str.trim())), // TODO this now returns AIR on failure instead of null, is that an issue?
+                item -> Registry.ITEM.getKey(item).toString()
        ),
        LIST() {
            @Override
@@ -263,6 +279,36 @@ public class SettingsUtil {
            public boolean accepts(Type type) {
                return List.class.isAssignableFrom(TypeUtils.resolveBaseClass(type));
            }
+        },
+        MAPPING() {
+            @Override
+            public Object parse(ParserContext context, String raw) {
+                Type keyType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
+                Type valueType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[1];
+                Parser keyParser = Parser.getParser(keyType);
+                Parser valueParser = Parser.getParser(valueType);
+
+                return Stream.of(raw.split(",(?=[^,]*->)"))
+                        .map(s -> s.split("->"))
+                        .collect(Collectors.toMap(s -> keyParser.parse(context, s[0]), s -> valueParser.parse(context, s[1])));
+            }
+
+            @Override
+            public String toString(ParserContext context, Object value) {
+                Type keyType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[0];
+                Type valueType = ((ParameterizedType) context.getSetting().getType()).getActualTypeArguments()[1];
+                Parser keyParser = Parser.getParser(keyType);
+                Parser valueParser = Parser.getParser(valueType);
+
+                return ((Map<?,?>) value).entrySet().stream()
+                        .map(o -> keyParser.toString(context, o.getKey()) + "->" + valueParser.toString(context, o.getValue()))
+                        .collect(Collectors.joining(","));
+            }
+
+            @Override
+            public boolean accepts(Type type) {
+                return Map.class.isAssignableFrom(TypeUtils.resolveBaseClass(type));
+            }
        };

        private final Class<?> cla$$;
--- a/src/api/java/baritone/api/utils/VecUtils.java
+++ b/src/api/java/baritone/api/utils/VecUtils.java
@@ -17,14 +17,14 @@

 package baritone.api.utils;

-import net.minecraft.block.BlockFire;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.world.World;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.BaseFireBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;

 /**
 * @author Brady
@@ -42,22 +42,22 @@ public final class VecUtils {
     * @return The center of the block's bounding box
     * @see #getBlockPosCenter(BlockPos)
     */
-    public static Vec3d calculateBlockCenter(World world, BlockPos pos) {
-        IBlockState b = world.getBlockState(pos);
+    public static Vec3 calculateBlockCenter(Level world, BlockPos pos) {
+        BlockState b = world.getBlockState(pos);
        VoxelShape shape = b.getCollisionShape(world, pos);
        if (shape.isEmpty()) {
            return getBlockPosCenter(pos);
        }
-        double xDiff = (shape.getStart(EnumFacing.Axis.X) + shape.getEnd(EnumFacing.Axis.X)) / 2;
-        double yDiff = (shape.getStart(EnumFacing.Axis.Y) + shape.getEnd(EnumFacing.Axis.Y)) / 2;
-        double zDiff = (shape.getStart(EnumFacing.Axis.Z) + shape.getEnd(EnumFacing.Axis.Z)) / 2;
+        double xDiff = (shape.min(Direction.Axis.X) + shape.max(Direction.Axis.X)) / 2;
+        double yDiff = (shape.min(Direction.Axis.Y) + shape.max(Direction.Axis.Y)) / 2;
+        double zDiff = (shape.min(Direction.Axis.Z) + shape.max(Direction.Axis.Z)) / 2;
        if (Double.isNaN(xDiff) || Double.isNaN(yDiff) || Double.isNaN(zDiff)) {
            throw new IllegalStateException(b + " " + pos + " " + shape);
        }
-        if (b.getBlock() instanceof BlockFire) {//look at bottom of fire when putting it out
+        if (b.getBlock() instanceof BaseFireBlock) {//look at bottom of fire when putting it out
            yDiff = 0;
        }
-        return new Vec3d(
+        return new Vec3(
                pos.getX() + xDiff,
                pos.getY() + yDiff,
                pos.getZ() + zDiff
@@ -72,10 +72,10 @@ public final class VecUtils {
     *
     * @param pos The block position
     * @return The assumed center of the position
-     * @see #calculateBlockCenter(World, BlockPos)
+     * @see #calculateBlockCenter(Level, BlockPos)
     */
-    public static Vec3d getBlockPosCenter(BlockPos pos) {
-        return new Vec3d(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
+    public static Vec3 getBlockPosCenter(BlockPos pos) {
+        return new Vec3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
    }

    /**
@@ -105,7 +105,7 @@ public final class VecUtils {
     * @see #getBlockPosCenter(BlockPos)
     */
    public static double entityDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.posX, entity.posY, entity.posZ);
+        return distanceToCenter(pos, entity.position().x, entity.position().y, entity.position().z);
    }

    /**
@@ -118,6 +118,6 @@ public final class VecUtils {
     * @see #getBlockPosCenter(BlockPos)
     */
    public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
-        return distanceToCenter(pos, entity.posX, pos.getY() + 0.5, entity.posZ);
+        return distanceToCenter(pos, entity.position().x, pos.getY() + 0.5, entity.position().z);
    }
 }
--- a/src/api/java/baritone/api/utils/gui/BaritoneToast.java
+++ b/src/api/java/baritone/api/utils/gui/BaritoneToast.java
@@ -17,58 +17,66 @@

 package baritone.api.utils.gui;

-import net.minecraft.client.gui.toasts.GuiToast;
-import net.minecraft.client.gui.toasts.IToast;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.toasts.Toast;
+import net.minecraft.client.gui.components.toasts.ToastComponent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;

-public class BaritoneToast implements IToast {
+public class BaritoneToast implements Toast {
    private String title;
    private String subtitle;
    private long firstDrawTime;
    private boolean newDisplay;
    private long totalShowTime;

-    public BaritoneToast(ITextComponent titleComponent, ITextComponent subtitleComponent, long totalShowTime) {
-        this.title = titleComponent.getFormattedText();
-        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
+    public BaritoneToast(Component titleComponent, Component subtitleComponent, long totalShowTime) {
+        this.title = titleComponent.getString();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
        this.totalShowTime = totalShowTime;
    }

-    public Visibility draw(GuiToast toastGui, long delta) {
+    public Visibility render(PoseStack matrixStack, ToastComponent toastGui, long delta) {
        if (this.newDisplay) {
            this.firstDrawTime = delta;
            this.newDisplay = false;
        }

-        toastGui.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("textures/gui/toasts.png"));
-        GlStateManager.color4f(1.0F, 1.0F, 1.0F, 255.0f);
-        toastGui.drawTexturedModalRect(0, 0, 0, 32, 160, 32);
+
+        //TODO: check
+        toastGui.getMinecraft().getTextureManager().bindForSetup(new ResourceLocation("textures/gui/toasts.png"));
+        //GlStateManager._color4f(1.0F, 1.0F, 1.0F, 255.0F);
+        toastGui.blit(matrixStack, 0, 0, 0, 32, 160, 32);

        if (this.subtitle == null) {
-            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 12, -11534256);
+            toastGui.getMinecraft().font.draw(matrixStack, this.title, 18, 12, -11534256);
        } else {
-            toastGui.getMinecraft().fontRenderer.drawString(this.title, 18, 7, -11534256);
-            toastGui.getMinecraft().fontRenderer.drawString(this.subtitle, 18, 18, -16777216);
+            toastGui.getMinecraft().font.draw(matrixStack, this.title, 18, 7, -11534256);
+            toastGui.getMinecraft().font.draw(matrixStack, this.subtitle, 18, 18, -16777216);
        }

        return delta - this.firstDrawTime < totalShowTime ? Visibility.SHOW : Visibility.HIDE;
    }

-    public void setDisplayedText(ITextComponent titleComponent, ITextComponent subtitleComponent) {
-        this.title = titleComponent.getFormattedText();
-        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getFormattedText();
+    public void setDisplayedText(Component titleComponent, Component subtitleComponent) {
+        this.title = titleComponent.getString();
+        this.subtitle = subtitleComponent == null ? null : subtitleComponent.getString();
        this.newDisplay = true;
    }

-    public static void addOrUpdate(GuiToast toast, ITextComponent title, ITextComponent subtitle, long totalShowTime) {
+    public static void addOrUpdate(ToastComponent toast, Component title, Component subtitle, long totalShowTime) {
        BaritoneToast baritonetoast = toast.getToast(BaritoneToast.class, new Object());

        if (baritonetoast == null) {
-            toast.add(new BaritoneToast(title, subtitle, totalShowTime));
+            toast.addToast(new BaritoneToast(title, subtitle, totalShowTime));
        } else {
            baritonetoast.setDisplayedText(title, subtitle);
        }
    }
+
+    public static void addOrUpdate(Component title, Component subtitle) {
+        addOrUpdate(Minecraft.getInstance().getToasts(), title, subtitle, baritone.api.BaritoneAPI.getSettings().toastTimer.value);
+    }
 }
--- a/src/api/java/baritone/api/utils/interfaces/IGoalRenderPos.java
+++ b/src/api/java/baritone/api/utils/interfaces/IGoalRenderPos.java
@@ -17,7 +17,7 @@

 package baritone.api.utils.interfaces;

-import net.minecraft.util.math.BlockPos;
+import net.minecraft.core.BlockPos;

 public interface IGoalRenderPos {

--- a/src/launch/java/baritone/launch/BaritoneMixinConnector.java
+++ b/src/launch/java/baritone/launch/BaritoneMixinConnector.java
@@ -0,0 +1,29 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch;
+
+import org.spongepowered.asm.mixin.Mixins;
+import org.spongepowered.asm.mixin.connect.IMixinConnector;
+
+public class BaritoneMixinConnector implements IMixinConnector {
+
+    @Override
+    public void connect() {
+        Mixins.addConfiguration("mixins.baritone.json");
+    }
+}
--- a/src/launch/java/baritone/launch/mixins/MixinAnvilChunkLoader.java
+++ b/src/launch/java/baritone/launch/mixins/MixinAnvilChunkLoader.java
@@ -1,43 +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 <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IAnvilChunkLoader;
-import net.minecraft.world.chunk.storage.AnvilChunkLoader;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.io.File;
-
-/**
- * @author Brady
- * @since 9/4/2018
- */
-@Mixin(AnvilChunkLoader.class)
-public class MixinAnvilChunkLoader implements IAnvilChunkLoader {
-
-    @Shadow
-    @Final
-    private File chunkSaveLocation;
-
-    @Override
-    public File getChunkSaveLocation() {
-        return this.chunkSaveLocation;
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinBitArray.java
+++ b/src/launch/java/baritone/launch/mixins/MixinBitArray.java
@@ -1,67 +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 <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IBitArray;
-import net.minecraft.util.BitArray;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-
-@Mixin(BitArray.class)
-public abstract class MixinBitArray implements IBitArray {
-
-    @Shadow
-    @Final
-    private long[] longArray;
-
-    @Shadow
-    @Final
-    private int bitsPerEntry;
-
-    @Shadow
-    @Final
-    private long maxEntryValue;
-
-    @Shadow
-    @Final
-    private int arraySize;
-
-    @Override
-    @Unique
-    public int[] toArray() {
-        int[] out = new int[arraySize];
-
-        for (int idx = 0, kl = bitsPerEntry - 1; idx < arraySize; idx++, kl += bitsPerEntry) {
-            final int i = idx * bitsPerEntry;
-            final int j = i >> 6;
-            final int l = i & 63;
-            final int k = kl >> 6;
-            final long jl = longArray[j] >>> l;
-
-            if (j == k) {
-                out[idx] = (int) (jl & maxEntryValue);
-            } else {
-                out[idx] = (int) ((jl | longArray[k] << (64 - l)) & maxEntryValue);
-            }
-        }
-
-        return out;
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java
@@ -1,47 +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 <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IBitArray;
-import baritone.utils.accessor.IBlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BitArray;
-import net.minecraft.world.chunk.BlockStateContainer;
-import net.minecraft.world.chunk.IBlockStatePalette;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-@Mixin(BlockStateContainer.class)
-public abstract class MixinBlockStateContainer implements IBlockStateContainer {
-
-    @Shadow
-    protected BitArray storage;
-
-    @Shadow
-    protected IBlockStatePalette<IBlockState> palette;
-
-    @Override
-    public IBlockState getAtPalette(int index) {
-        return palette.get(index);
-    }
-
-    @Override
-    public int[] storageArray() {
-        return ((IBitArray) storage).toArray();
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinChunkArray.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChunkArray.java
@@ -0,0 +1,92 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+package baritone.launch.mixins;
+
+import baritone.utils.accessor.IChunkArray;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.concurrent.atomic.AtomicReferenceArray;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.chunk.LevelChunk;
+
+@Mixin(targets = "net.minecraft.client.multiplayer.ClientChunkCache$Storage")
+public abstract class MixinChunkArray implements IChunkArray {
+    @Shadow
+    private AtomicReferenceArray<LevelChunk> chunks;
+    @Shadow
+    private int chunkRadius;
+    @Shadow
+    private int viewRange;
+    @Shadow
+    private int viewCenterX;
+    @Shadow
+    private int viewCenterZ;
+    @Shadow
+    private int chunkCount;
+
+    @Shadow
+    protected abstract boolean inRange(int x, int z);
+
+    @Shadow
+    protected abstract int getIndex(int x, int z);
+
+    @Shadow
+    protected abstract void replace(int index, LevelChunk chunk);
+
+    @Override
+    public int centerX() {
+        return viewCenterX;
+    }
+
+    @Override
+    public int centerZ() {
+        return viewCenterZ;
+    }
+
+    @Override
+    public int viewDistance() {
+        return chunkRadius;
+    }
+
+    @Override
+    public AtomicReferenceArray<LevelChunk> getChunks() {
+        return chunks;
+    }
+
+    @Override
+    public void copyFrom(IChunkArray other) {
+        viewCenterX = other.centerX();
+        viewCenterZ = other.centerZ();
+
+        AtomicReferenceArray<LevelChunk> copyingFrom = other.getChunks();
+        for (int k = 0; k < copyingFrom.length(); ++k) {
+            LevelChunk chunk = copyingFrom.get(k);
+            if (chunk != null) {
+                ChunkPos chunkpos = chunk.getPos();
+                if (inRange(chunkpos.x, chunkpos.z)) {
+                    int index = getIndex(chunkpos.x, chunkpos.z);
+                    if (chunks.get(index) != null) {
+                        throw new IllegalStateException("Doing this would mutate the client's REAL loaded chunks?!");
+                    }
+                    replace(index, chunk);
+                }
+            }
+        }
+    }
+}
--- a/src/launch/java/baritone/launch/mixins/MixinChunkProviderClient.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChunkProviderClient.java
@@ -1,39 +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 <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.utils.accessor.IChunkProviderClient;
-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import net.minecraft.client.multiplayer.ChunkProviderClient;
-import net.minecraft.world.chunk.Chunk;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
-@Mixin(ChunkProviderClient.class)
-public class MixinChunkProviderClient implements IChunkProviderClient {
-
-    @Shadow
-    @Final
-    private Long2ObjectMap<Chunk> loadedChunks;
-
-    @Override
-    public Long2ObjectMap<Chunk> loadedChunks() {
-        return this.loadedChunks;
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinChunkRenderContainer.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChunkRenderContainer.java
@@ -1,55 +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 <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ChunkRenderContainer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.chunk.RenderChunk;
-import net.minecraft.util.math.BlockPos;
-import org.lwjgl.opengl.GL14;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import static org.lwjgl.opengl.GL11.GL_ONE;
-import static org.lwjgl.opengl.GL11.GL_ZERO;
-import static org.lwjgl.opengl.GL14.GL_CONSTANT_ALPHA;
-import static org.lwjgl.opengl.GL14.GL_ONE_MINUS_CONSTANT_ALPHA;
-
-@Mixin(ChunkRenderContainer.class)
-public class MixinChunkRenderContainer {
-
-    @Redirect( // avoid creating CallbackInfo at all costs; this is called 40k times per second
-            method = "preRenderChunk",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/renderer/chunk/RenderChunk.getPosition()Lnet/minecraft/util/math/BlockPos;"
-            )
-    )
-    private BlockPos getPosition(RenderChunk renderChunkIn) {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer() && Minecraft.getInstance().world.getChunk(renderChunkIn.getPosition()).isEmpty()) {
-            GlStateManager.enableAlphaTest();
-            GlStateManager.enableBlend();
-            GL14.glBlendColor(0, 0, 0, Baritone.settings().cachedChunksOpacity.value);
-            GlStateManager.blendFuncSeparate(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA, GL_ONE, GL_ZERO);
-        }
-        return renderChunkIn.getPosition();
-    }
-}
--- a/src/launch/java/baritone/launch/mixins/MixinChunkRenderWorker.java
+++ b/src/launch/java/baritone/launch/mixins/MixinChunkRenderWorker.java
@@ -1,57 +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 <https://www.gnu.org/licenses/>.
- */
-
-package baritone.launch.mixins;
-
-import baritone.Baritone;
-import baritone.api.BaritoneAPI;
-import baritone.api.utils.IPlayerContext;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.chunk.ChunkRenderWorker;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-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.Redirect;
-
-@Mixin(ChunkRenderWorker.class)
-public abstract class MixinChunkRenderWorker {
-
-    @Shadow
-    protected abstract boolean isChunkExisting(BlockPos pos, World worldIn);
-
-    @Redirect(
-            method = "processTask",
-            at = @At(
-                    value = "INVOKE",
-                    target = "net/minecraft/client/renderer/chunk/ChunkRenderWorker.isChunkExisting(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;)Z"
-            )
-    )
-    private boolean isChunkExisting(ChunkRenderWorker worker, BlockPos pos, World world) {
-        if (Baritone.settings().renderCachedChunks.value && !Minecraft.getInstance().isSingleplayer()) {
-            Baritone baritone = (Baritone) BaritoneAPI.getProvider().getPrimaryBaritone();
-            IPlayerContext ctx = baritone.getPlayerContext();
-            if (ctx.player() != null && ctx.world() != null && baritone.bsi != null) {
-                return baritone.bsi.isLoaded(pos.getX(), pos.getZ()) || this.isChunkExisting(pos, world);
-            }
-        }
-
-        return this.isChunkExisting(pos, world);
-    }
-}
-
--- a/Show More
+++ b/Show More