v1.5.0

There is likely a better solution, but I think this is fine in order to keep things in-line with the development over at Mojang.

build.gradle

@@ -16,7 +16,7 @@
  */
 
 group 'baritone'
-version '1.4.4'
+version '1.5.0'
 
 buildscript {
     repositories {
@@ -82,7 +82,7 @@ task sourceJar(type: Jar, dependsOn: classes) {
 }
 
 minecraft {
-    mappings channel: 'snapshot', version: '20190814-1.14.3'
+    mappings channel: 'snapshot', version: '20200205-1.15.1'
     reobfMappings 'notch'
 
     runs {
@@ -138,7 +138,7 @@ repositories {
 }
 
 dependencies {
-    minecraft 'com.github.ImpactDevelopment:Vanilla:1.14.4'
+    minecraft 'com.github.ImpactDevelopment:Vanilla:1.15.2'
 
     runtime launchCompile('net.minecraft:launchwrapper:1.12') {
         exclude module: 'lwjgl'
@@ -155,9 +155,6 @@ dependencies {
     }
 
     testImplementation 'junit:junit:4.12'
-
-    compileOnly 'org.projectlombok:lombok:1.18.12'
-    annotationProcessor 'org.projectlombok:lombok:1.18.12'
 }
 
 mixin {

src/api/java/baritone/api/Settings.java

@@ -30,8 +30,8 @@ import java.awt.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 import java.util.function.Consumer;
 
 /**
@@ -830,11 +830,6 @@ public final class Settings {
      */
     public final Setting<Boolean> mineScanDroppedItems = new Setting<>(true);
 
-    /**
-     * Hyritone: Detect ore locations with a separate world seed.
-     */
-    public final Setting<Boolean> mineWithSeed = new Setting<>(false);
-
     /**
      * While mining, wait this number of milliseconds after mining an ore to see if it will drop an item
      * instead of immediately going onto the next one
@@ -963,6 +958,11 @@ public final class Settings {
      */
     public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);
 
+    /**
+     * 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
      */

src/api/java/baritone/api/event/events/RenderEvent.java

@@ -17,6 +17,8 @@
 
 package baritone.api.event.events;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
+
 /**
  * @author Brady
  * @since 8/5/2018
@@ -28,8 +30,12 @@ public final class RenderEvent {
      */
     private final float partialTicks;
 
-    public RenderEvent(float partialTicks) {
+    private final MatrixStack modelViewStack, projectionStack;
+
+    public RenderEvent(float partialTicks, MatrixStack modelViewStack, MatrixStack projectionStack) {
         this.partialTicks = partialTicks;
+        this.modelViewStack = modelViewStack;
+        this.projectionStack = projectionStack;
     }
 
     /**
@@ -38,4 +44,12 @@ public final class RenderEvent {
     public final float getPartialTicks() {
         return this.partialTicks;
     }
+
+    public final MatrixStack getModelViewStack() {
+        return this.modelViewStack;
+    }
+
+    public final MatrixStack getProjectionStack() {
+        return this.projectionStack;
+    }
 }

src/api/java/baritone/api/event/listener/AbstractGameEventListener.java

@@ -18,7 +18,6 @@
 package baritone.api.event.listener;
 
 import baritone.api.event.events.*;
-import net.minecraft.util.math.BlockPos;
 
 /**
  * An implementation of {@link IGameEventListener} that has all methods
@@ -72,7 +71,4 @@ public interface AbstractGameEventListener extends IGameEventListener {
 
     @Override
     default void onPathEvent(PathEvent event) {}
-
-    @Override
-    default void onBlockBreak(BlockPos pos) {}
 }

src/api/java/baritone/api/event/listener/IGameEventListener.java

@@ -20,10 +20,10 @@ package baritone.api.event.listener;
 import baritone.api.event.events.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.gui.screen.DeathScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.math.BlockPos;
 
 /**
  * @author Brady
@@ -137,11 +137,4 @@ public interface IGameEventListener {
      * @param event The event
      */
     void onPathEvent(PathEvent event);
-
-    /**
-     * This is called when the player breaks blocks.
-     *
-     * @param pos Block position
-     */
-    void onBlockBreak(BlockPos pos);
 }

src/api/java/baritone/api/utils/BlockOptionalMeta.java

@@ -20,14 +20,14 @@ package baritone.api.utils;
 import baritone.api.utils.accessor.IItemStack;
 import com.google.common.collect.ImmutableSet;
 import io.netty.util.concurrent.ThreadPerTaskExecutor;
-import net.minecraft.block.*;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.resources.*;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Unit;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.registry.Registry;
 import net.minecraft.world.storage.loot.*;
 
 import javax.annotation.Nonnull;
@@ -46,6 +46,7 @@ public final class BlockOptionalMeta {
     private final ImmutableSet<Integer> stackHashes;
     private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
     private static LootTableManager manager;
+    private static LootPredicateManager predicate = new LootPredicateManager();
     private static Map<Block, List<Item>> drops = new HashMap<>();
 
     public BlockOptionalMeta(@Nonnull Block block) {
@@ -64,13 +65,7 @@ public final class BlockOptionalMeta {
 
         MatchResult matchResult = matcher.toMatchResult();
 
-        ResourceLocation id = new ResourceLocation(matchResult.group(1));
+        block = BlockUtils.stringToBlockRequired(matchResult.group(1));
-
-        if (!Registry.BLOCK.containsKey(id)) {
-            throw new IllegalArgumentException("Invalid block ID");
-        }
-
-        block = Registry.BLOCK.getValue(id).orElse(null);
         blockstates = getStates(block);
         stateHashes = getStateHashes(blockstates);
         stackHashes = getStackHashes(blockstates);
@@ -143,7 +138,7 @@ public final class BlockOptionalMeta {
             rpl.reloadPacksFromFinders();
             IResourcePack thePack = ((ResourcePackInfo) rpl.getAllPacks().iterator().next()).getResourcePack();
             IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA, null);
-            manager = new LootTableManager();
+            manager = new LootTableManager(predicate);
             resourceManager.addReloadListener(manager);
             try {
                 resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
@@ -154,6 +149,10 @@ public final class BlockOptionalMeta {
         return manager;
     }
 
+    public static LootPredicateManager getPredicateManager() {
+        return predicate;
+    }
+
     private static synchronized List<Item> drops(Block b) {
         return drops.computeIfAbsent(b, block -> {
             ResourceLocation lootTableLocation = block.getLootTable();

src/api/java/baritone/api/utils/IPlayerContext.java

@@ -56,7 +56,7 @@ public interface IPlayerContext {
 
     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().getPositionVec().x, player().getPositionVec().y + 0.1251, player().getPositionVec().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
@@ -76,11 +76,11 @@ public interface IPlayerContext {
     }
 
     default Vec3d playerFeetAsVec() {
-        return new Vec3d(player().posX, player().posY, player().posZ);
+        return new Vec3d(player().getPositionVec().x, player().getPositionVec().y, player().getPositionVec().z);
     }
 
     default Vec3d playerHead() {
-        return new Vec3d(player().posX, player().posY + player().getEyeHeight(), player().posZ);
+        return new Vec3d(player().getPositionVec().x, player().getPositionVec().y + player().getEyeHeight(), player().getPositionVec().z);
     }
 
     default Rotation playerRotations() {

src/api/java/baritone/api/utils/VecUtils.java

@@ -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.getPositionVec().x, entity.getPositionVec().y, entity.getPositionVec().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.getPositionVec().x, pos.getY() + 0.5, entity.getPositionVec().z);
     }
 }

src/launch/java/baritone/launch/LaunchTesting.java

@@ -57,9 +57,6 @@ public class LaunchTesting {
             attemptLogin(arguments, System.getenv("username"), System.getenv("password"));
         }
 
-        // Unify username
-        arguments.put("username", "TestUser");
-
         List<String> argsArray = new ArrayList<>();
         arguments.forEach((k, v) -> {
             argsArray.add("--" + k);

src/launch/java/baritone/launch/mixins/MixinCommandSuggestionHelper.java

@@ -22,7 +22,7 @@ import baritone.api.event.events.TabCompleteEvent;
 import com.mojang.brigadier.context.StringRange;
 import com.mojang.brigadier.suggestion.Suggestion;
 import com.mojang.brigadier.suggestion.Suggestions;
-import net.minecraft.client.gui.screen.ChatScreen;
+import net.minecraft.client.gui.CommandSuggestionHelper;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -40,27 +40,28 @@ import java.util.stream.Stream;
  * @author Brady
  * @since 10/9/2019
  */
-@Mixin(ChatScreen.class)
+@Mixin(CommandSuggestionHelper.class)
-public class MixinChatScreen {
+public class MixinCommandSuggestionHelper {
-
-    @Shadow
-    protected TextFieldWidget inputField;
 
     @Shadow
     @Final
-    protected List<String> commandUsage;
+    private TextFieldWidget field_228095_d_;
 
     @Shadow
-    private CompletableFuture<Suggestions> pendingSuggestions;
+    @Final
+    private List<String> field_228103_l_;
+
+    @Shadow
+    private CompletableFuture<Suggestions> field_228107_p_;
 
     @Inject(
-            method = "updateSuggestion",
+            method = "func_228111_a_",
             at = @At("HEAD"),
             cancellable = true
     )
     private void preUpdateSuggestion(CallbackInfo ci) {
         // Anything that is present in the input text before the cursor position
-        String prefix = this.inputField.getText().substring(0, Math.min(this.inputField.getText().length(), this.inputField.getCursorPosition()));
+        String prefix = this.field_228095_d_.getText().substring(0, Math.min(this.field_228095_d_.getText().length(), this.field_228095_d_.getCursorPosition()));
 
         TabCompleteEvent event = new TabCompleteEvent(prefix);
         BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onPreTabComplete(event);
@@ -74,14 +75,14 @@ public class MixinChatScreen {
             ci.cancel();
 
             // TODO: Support populating the command usage
-            this.commandUsage.clear();
+            this.field_228103_l_.clear();
 
             if (event.completions.length == 0) {
-                this.pendingSuggestions = Suggestions.empty();
+                this.field_228107_p_ = Suggestions.empty();
             } else {
-                int offset = this.inputField.getText().endsWith(" ")
+                int offset = this.field_228095_d_.getText().endsWith(" ")
-                        ? this.inputField.getCursorPosition()
+                        ? this.field_228095_d_.getCursorPosition()
-                        : this.inputField.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
+                        : this.field_228095_d_.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
 
                 List<Suggestion> suggestionList = Stream.of(event.completions)
                         .map(s -> new Suggestion(StringRange.between(offset, offset + s.length()), s))
@@ -91,8 +92,8 @@ public class MixinChatScreen {
                         StringRange.between(offset, offset + suggestionList.stream().mapToInt(s -> s.getText().length()).max().orElse(0)),
                         suggestionList);
 
-                this.pendingSuggestions = new CompletableFuture<>();
+                this.field_228107_p_ = new CompletableFuture<>();
-                this.pendingSuggestions.complete(suggestions);
+                this.field_228107_p_.complete(suggestions);
             }
         }
     }

src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java

@@ -20,29 +20,23 @@ package baritone.launch.mixins;
 import baritone.utils.accessor.IEntityRenderManager;
 import net.minecraft.client.renderer.entity.EntityRendererManager;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(EntityRendererManager.class)
 public class MixinEntityRenderManager implements IEntityRenderManager {
-    @Shadow
+
-    private double renderPosX;
-    @Shadow
-    private double renderPosY;
-    @Shadow
-    private double renderPosZ;
 
     @Override
     public double renderPosX() {
-        return renderPosX;
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().x;
     }
 
     @Override
     public double renderPosY() {
-        return renderPosY;
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().y;
     }
 
     @Override
     public double renderPosZ() {
-        return renderPosZ;
+        return ((EntityRendererManager) (Object) this).info.getProjectedView().z;
     }
 }

src/launch/java/baritone/launch/mixins/MixinGameRenderer.java

@@ -20,26 +20,31 @@ package baritone.launch.mixins;
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
 import baritone.api.event.events.RenderEvent;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(GameRenderer.class)
 public class MixinGameRenderer {
 
     @Inject(
-            method = "updateCameraAndRender(FJ)V",
+            method = "renderWorld",
             at = @At(
                     value = "INVOKE_STRING",
                     target = "Lnet/minecraft/profiler/IProfiler;endStartSection(Ljava/lang/String;)V",
                     args = {"ldc=hand"}
-            )
+            ),
+            locals = LocalCapture.CAPTURE_FAILHARD
     )
-    private void renderWorldPass(float partialTicks, long finishTimeNano, CallbackInfo ci) {
+    private void renderWorldPass(float partialTicks, long finishTimeNano, MatrixStack modelViewMatrix, CallbackInfo ci, boolean flag, ActiveRenderInfo activerenderinfo, MatrixStack projectionMatrix, float f, Matrix4f matrix4f) {
         for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
-            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks));
+            ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks, modelViewMatrix, projectionMatrix));
         }
     }
 }

src/launch/java/baritone/launch/mixins/MixinLootContext.java

@@ -21,6 +21,7 @@ import baritone.api.utils.BlockOptionalMeta;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootPredicateManager;
 import net.minecraft.world.storage.loot.LootTableManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -56,4 +57,18 @@ public class MixinLootContext {
         }
         return server.getLootTableManager();
     }
+
+    @Redirect(
+            method = "build",
+            at = @At(
+                    value = "INVOKE",
+                    target = "net/minecraft/server/MinecraftServer.func_229736_aP_()Lnet/minecraft/world/storage/loot/LootPredicateManager;"
+            )
+    )
+    private LootPredicateManager getLootPredicateManager(MinecraftServer server) {
+        if (server == null) {
+            return BlockOptionalMeta.getPredicateManager();
+        }
+        return server.func_229736_aP_();
+    }
 }

src/launch/java/baritone/launch/mixins/MixinMinecraft.java

@@ -19,7 +19,6 @@ package baritone.launch.mixins;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.IBaritone;
-import baritone.api.event.events.BlockInteractEvent;
 import baritone.api.event.events.TickEvent;
 import baritone.api.event.events.WorldEvent;
 import baritone.api.event.events.type.EventState;
@@ -28,10 +27,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Hand;
-import net.minecraft.util.math.BlockRayTraceResult;
 import org.spongepowered.asm.lib.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -39,7 +34,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import java.util.function.BiFunction;
 
@@ -56,7 +50,7 @@ public class MixinMinecraft {
     public ClientWorld world;
 
     @Inject(
-            method = "init",
+            method = "<init>",
             at = @At("RETURN")
     )
     private void postInit(CallbackInfo ci) {
@@ -64,11 +58,8 @@ public class MixinMinecraft {
     }
 
     @Inject(
-            method = "init",
+            method = "startTimerHackThread",
-            at = @At(
+            at = @At("HEAD")
-                    value = "INVOKE",
-                    target = "net/minecraft/client/Minecraft.startTimerHackThread()V"
-            )
     )
     private void preInit(CallbackInfo ci) {
         BaritoneAutoTest.INSTANCE.onPreInit();
@@ -148,16 +139,24 @@ public class MixinMinecraft {
         return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().getCurrent() != null && player != null) || screen.passEvents;
     }
 
-    @Inject(
+    // TODO
+    // FIXME
+    // bradyfix
+    // i cant mixin
+    // lol
+    // https://discordapp.com/channels/208753003996512258/503692253881958400/674760939681349652
+    // https://discordapp.com/channels/208753003996512258/503692253881958400/674756457966862376
+    /*@Inject(
             method = "rightClickMouse",
             at = @At(
                     value = "INVOKE",
-                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V"
+                    target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V",
+                    ordinal = 1
             ),
             locals = LocalCapture.CAPTURE_FAILHARD
     )
-    private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
+    private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, EntityRayTraceResult rt, Entity ent, ActionResultType art, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
         // rightClickMouse is only for the main player
         BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(raytrace.getPos(), BlockInteractEvent.Type.USE));
-    }
+    }*/
 }

src/launch/java/baritone/launch/mixins/MixinMouse.java

@@ -1,99 +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.IMouse;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.MouseHelper;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import static org.hydev.hyritone.utils.MiscUtils.sleep;
-
-/**
- * Mixin to control mouse operations
- * <p>
- * Class created by the HyDEV Team on 2020-02-21!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-02-21 13:54
- */
-@Mixin(MouseHelper.class)
-public abstract class MixinMouse implements IMouse
-{
-    @Shadow
-    protected abstract void mouseButtonCallback(long window, int button, int action, int mods);
-
-    @Shadow @Final private Minecraft minecraft;
-
-    @Inject(method = "mouseButtonCallback", at = @At("HEAD"), cancellable = true)
-    private void inject(long window, int button, int action, int mods, CallbackInfo info)
-    {
-        System.out.println(window + " | " + button + " | " + action + " | " + mods + " | " + System.currentTimeMillis());
-    }
-
-    public void rightClick()
-    {
-        new Thread(() ->
-        {
-            rightHold();
-            sleep((long) (70 + Math.random() * 10));
-            rightRelease();
-        }).start();
-    }
-
-    public void leftClick()
-    {
-        new Thread(() ->
-        {
-            leftHold();
-            sleep((long) (70 + Math.random() * 10));
-            leftRelease();
-        }).start();
-    }
-
-    @Override
-    public void rightHold()
-    {
-        mouseButtonCallback(minecraft.mainWindow.getHandle(), 1, 1, 0);
-    }
-
-    @Override
-    public void rightRelease()
-    {
-        mouseButtonCallback(minecraft.mainWindow.getHandle(), 1, 0, 0);
-    }
-
-    @Override
-    public void leftHold()
-    {
-        mouseButtonCallback(minecraft.mainWindow.getHandle(), 0, 1, 0);
-    }
-
-    @Override
-    public void leftRelease()
-    {
-        mouseButtonCallback(minecraft.mainWindow.getHandle(), 0, 0, 0);
-    }
-}

src/launch/java/baritone/launch/mixins/MixinPalettedContainer.java

@@ -18,22 +18,22 @@
 package baritone.launch.mixins;
 
 import baritone.utils.accessor.IBitArray;
-import baritone.utils.accessor.IBlockStateContainer;
+import baritone.utils.accessor.IPalettedContainer;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.BitArray;
-import net.minecraft.world.chunk.BlockStateContainer;
+import net.minecraft.util.palette.IPalette;
-import net.minecraft.world.chunk.IBlockStatePalette;
+import net.minecraft.util.palette.PalettedContainer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-@Mixin(BlockStateContainer.class)
+@Mixin(PalettedContainer.class)
-public abstract class MixinBlockStateContainer implements IBlockStateContainer {
+public abstract class MixinPalettedContainer implements IPalettedContainer {
 
     @Shadow
     protected BitArray storage;
 
     @Shadow
-    protected IBlockStatePalette<BlockState> palette;
+    protected IPalette<BlockState> palette;
 
     @Override
     public BlockState getAtPalette(int index) {

src/launch/java/baritone/launch/mixins/MixinPlayerController.java

@@ -17,28 +17,16 @@
 
 package baritone.launch.mixins;
 
-import baritone.api.BaritoneAPI;
-import baritone.api.IBaritone;
 import baritone.utils.accessor.IPlayerControllerMP;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.PlayerController;
 import net.minecraft.util.math.BlockPos;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.gen.Invoker;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PlayerController.class)
 public abstract class MixinPlayerController implements IPlayerControllerMP {
 
-    @Shadow
-    @Final
-    private Minecraft mc;
-
     @Accessor
     @Override
     public abstract void setIsHittingBlock(boolean isHittingBlock);
@@ -50,20 +38,4 @@ public abstract class MixinPlayerController implements IPlayerControllerMP {
     @Invoker
     @Override
     public abstract void callSyncCurrentPlayItem();
-
-    @Inject(
-        method = "onPlayerDestroyBlock",
-        at = @At(value = "TAIL")
-    )
-    public void onPlayerDestroyBlock(BlockPos pos, CallbackInfoReturnable<Boolean> cir)
-    {
-        // Check if the block is broken
-        if (!cir.getReturnValue()) return;
-
-        // Call event
-        IBaritone baritone = BaritoneAPI.getProvider().getBaritoneForPlayer(this.mc.player);
-        if (baritone != null) {
-            baritone.getGameEventHandler().onBlockBreak(pos);
-        }
-    }
 }

src/launch/java/baritone/launch/mixins/MixinScreen.java

@@ -29,5 +29,5 @@ public abstract class MixinScreen implements IGuiScreen {
 
     @Override
     @Invoker("openLink")
-    public abstract void openLinkInvoker(URI url);
+    public abstract void openLink(URI url);
 }

src/launch/resources/mixins.baritone.json

@@ -9,8 +9,7 @@
   },
   "client": [
     "MixinBitArray",
-    "MixinBlockStateContainer",
+    "MixinCommandSuggestionHelper",
-    "MixinChatScreen",
     "MixinChunkArray",
     "MixinClientChunkProvider",
     "MixinClientPlayerEntity",
@@ -23,6 +22,7 @@
     "MixinLootContext",
     "MixinMinecraft",
     "MixinNetworkManager",
+    "MixinPalettedContainer",
     "MixinPlayerController",
     "MixinScreen"
   ]

src/main/java/baritone/Baritone.java

@@ -25,13 +25,12 @@ import baritone.api.utils.Helper;
 import baritone.api.utils.IPlayerContext;
 import baritone.behavior.*;
 import baritone.cache.WorldProvider;
-import baritone.command.manager.CommandManager;
 import baritone.event.GameEventHandler;
 import baritone.process.*;
 import baritone.selection.SelectionManager;
 import baritone.utils.*;
+import baritone.command.manager.CommandManager;
 import baritone.utils.player.PrimaryPlayerContext;
-import org.hydev.hyritone.Hyritone;
 import net.minecraft.client.Minecraft;
 
 import java.io.File;
@@ -88,8 +87,6 @@ public class Baritone implements IBaritone {
 
     public BlockStateInterface bsi;
 
-    public Hyritone hyritone;
-
     Baritone() {
         this.gameEventHandler = new GameEventHandler(this);
 
@@ -124,9 +121,6 @@ public class Baritone implements IBaritone {
         if (BaritoneAutoTest.ENABLE_AUTO_TEST) {
             this.gameEventHandler.registerEventListener(BaritoneAutoTest.INSTANCE);
         }
-
-        // Hyritone
-        this.hyritone = new Hyritone(this);
     }
 
     @Override

src/main/java/baritone/behavior/InventoryBehavior.java

@@ -137,7 +137,7 @@ public final class InventoryBehavior extends Behavior {
 
     public boolean selectThrowawayForLocation(boolean select, int x, int y, int z) {
         BlockState maybe = baritone.getBuilderProcess().placeAt(x, y, z, baritone.bsi.get0(x, y, z));
-        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().posX, ctx.player().posY, ctx.player().posZ), Direction.UP, ctx.playerFeet(), false)) {}))))) {
+        if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().getPositionVec().x, ctx.player().getPositionVec().y, ctx.player().getPositionVec().z), Direction.UP, ctx.playerFeet(), false)) {}))))) {
             return true; // gotem
         }
         if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock().equals(maybe.getBlock()))) {

src/main/java/baritone/behavior/PathingBehavior.java

@@ -381,8 +381,8 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
         BetterBlockPos feet = ctx.playerFeet();
         if (!MovementHelper.canWalkOn(ctx, feet.down())) {
             if (ctx.player().onGround) {
-                double playerX = ctx.player().posX;
+                double playerX = ctx.player().getPositionVec().x;
-                double playerZ = ctx.player().posZ;
+                double playerZ = ctx.player().getPositionVec().z;
                 ArrayList<BetterBlockPos> closest = new ArrayList<>();
                 for (int dx = -1; dx <= 1; dx++) {
                     for (int dz = -1; dz <= 1; dz++) {

src/main/java/baritone/cache/ChunkPacker.java

@@ -23,7 +23,7 @@ import baritone.utils.pathing.PathingBlockType;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.chunk.BlockStateContainer;
+import net.minecraft.util.palette.PalettedContainer;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkSection;
 
@@ -59,7 +59,7 @@ public final class ChunkPacker {
                     // since a bitset is initialized to all zero, and air is saved as zeros
                     continue;
                 }
-                BlockStateContainer<BlockState> bsc = extendedblockstorage.getData();
+                PalettedContainer<BlockState> bsc = extendedblockstorage.getData();
                 int yReal = y0 << 4;
                 // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
                 // for better cache locality, iterate in that order

src/main/java/baritone/cache/WorldScanner.java

@@ -22,7 +22,7 @@ import baritone.api.cache.IWorldScanner;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.BlockOptionalMetaLookup;
 import baritone.api.utils.IPlayerContext;
-import baritone.utils.accessor.IBlockStateContainer;
+import baritone.utils.accessor.IPalettedContainer;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.multiplayer.ClientChunkProvider;
 import net.minecraft.util.math.BlockPos;
@@ -30,7 +30,6 @@ import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.chunk.AbstractChunkProvider;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkSection;
-import net.minecraft.world.chunk.IChunk;
 
 import java.util.*;
 import java.util.stream.IntStream;
@@ -156,7 +155,7 @@ public enum WorldScanner implements IWorldScanner {
                 continue;
             }
             int yReal = y0 << 4;
-            IBlockStateContainer bsc = (IBlockStateContainer) section.getData();
+            IPalettedContainer bsc = (IPalettedContainer) section.getData();
             // storageArray uses an optimized algorithm that's faster than getAt
             // creating this array and then using getAtPalette is faster than even getFast(int index)
             int[] storage = bsc.storageArray();

src/main/java/baritone/command/BaritoneChatControl.java

@@ -100,7 +100,7 @@ public class BaritoneChatControl implements Helper, AbstractGameEventListener {
             return false;
         } else if (msg.trim().equalsIgnoreCase("orderpizza")) {
             try {
-                ((IGuiScreen) mc.currentScreen).openLinkInvoker(new URI("https://www.dominos.com/en/pages/order/"));
+                ((IGuiScreen) mc.currentScreen).openLink(new URI("https://www.dominos.com/en/pages/order/"));
             } catch (NullPointerException | URISyntaxException ignored) {}
             return false;
         }

src/main/java/baritone/command/argument/ArgConsumer.java

@@ -17,7 +17,9 @@
 
 package baritone.command.argument;
 
+import baritone.Baritone;
 import baritone.api.IBaritone;
+import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.argument.ICommandArgument;
 import baritone.api.command.datatypes.IDatatype;
 import baritone.api.command.datatypes.IDatatypeContext;
@@ -27,7 +29,6 @@ import baritone.api.command.exception.CommandException;
 import baritone.api.command.exception.CommandInvalidTypeException;
 import baritone.api.command.exception.CommandNotEnoughArgumentsException;
 import baritone.api.command.exception.CommandTooManyArgumentsException;
-import baritone.api.command.argument.IArgConsumer;
 import baritone.api.command.manager.ICommandManager;
 
 import java.util.ArrayList;
@@ -316,6 +317,9 @@ public class ArgConsumer implements IArgConsumer {
         try {
             return datatype.apply(this.context, original);
         } catch (Exception e) {
+            if (Baritone.settings().verboseCommandExceptions.value) {
+                e.printStackTrace();
+            }
             throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
         }
     }
@@ -345,6 +349,9 @@ public class ArgConsumer implements IArgConsumer {
         try {
             return datatype.get(this.context);
         } catch (Exception e) {
+            if (Baritone.settings().verboseCommandExceptions.value) {
+                e.printStackTrace();
+            }
             throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
         }
     }

src/main/java/baritone/command/defaults/DefaultCommands.java

@@ -19,7 +19,6 @@ package baritone.command.defaults;
 
 import baritone.api.IBaritone;
 import baritone.api.command.ICommand;
-import org.hydev.hyritone.seedxray.SeedXrayCommand;
 
 import java.util.*;
 
@@ -65,10 +64,7 @@ public final class DefaultCommands {
                 new WaypointsCommand(baritone),
                 new CommandAlias(baritone, "sethome", "Sets your home waypoint", "waypoints save home"),
                 new CommandAlias(baritone, "home", "Set goal to your home waypoint", "waypoints goal home"),
-                new SelCommand(baritone),
+                new SelCommand(baritone)
-
-                // Hyritone
-                new SeedXrayCommand(baritone)
         ));
         ExecutionControlCommands prc = new ExecutionControlCommands(baritone);
         commands.add(prc.pauseCommand);

src/main/java/baritone/command/defaults/SelCommand.java

@@ -68,7 +68,7 @@ public class SelCommand extends Command {
                 float lineWidth = Baritone.settings().selectionLineWidth.value;
                 boolean ignoreDepth = Baritone.settings().renderSelectionIgnoreDepth.value;
                 IRenderer.startLines(color, opacity, lineWidth, ignoreDepth);
-                IRenderer.drawAABB(new AxisAlignedBB(pos1, pos1.add(1, 1, 1)));
+                IRenderer.drawAABB(event.getModelViewStack(), new AxisAlignedBB(pos1, pos1.add(1, 1, 1)));
                 IRenderer.endLines(ignoreDepth);
             }
         });

src/main/java/baritone/event/GameEventHandler.java

@@ -25,7 +25,6 @@ import baritone.api.event.listener.IGameEventListener;
 import baritone.api.utils.Helper;
 import baritone.cache.WorldProvider;
 import baritone.utils.BlockStateInterface;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 
@@ -162,9 +161,4 @@ public final class GameEventHandler implements IEventBus, Helper {
     public final void registerEventListener(IGameEventListener listener) {
         this.listeners.add(listener);
     }
-
-    public final void onBlockBreak(BlockPos blockPos)
-    {
-        listeners.forEach(l -> l.onBlockBreak(blockPos));
-    }
 }

src/main/java/baritone/pathing/movement/MovementHelper.java

@@ -91,7 +91,7 @@ public interface MovementHelper extends ActionCosts, Helper {
         if (block instanceof AirBlock) { // early return for most common case
             return true;
         }
-        if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock) {
+        if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.HONEY_BLOCK) {
             return false;
         }
         if (Baritone.settings().blocksToAvoid.value.contains(block)) {

src/main/java/baritone/pathing/movement/movements/MovementAscend.java

@@ -176,7 +176,7 @@ public class MovementAscend extends Movement {
             ticksWithoutPlacement++;
             if (MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false) == PlaceResult.READY_TO_PLACE) {
                 state.setInput(Input.SNEAK, true);
-                if (ctx.player().isSneaking()) {
+                if (ctx.player().isCrouching()) {
                     state.setInput(Input.CLICK_RIGHT, true);
                 }
             }
@@ -199,8 +199,8 @@ public class MovementAscend extends Movement {
 
         int xAxis = Math.abs(src.getX() - dest.getX()); // either 0 or 1
         int zAxis = Math.abs(src.getZ() - dest.getZ()); // either 0 or 1
-        double flatDistToNext = xAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().posX) + zAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().posZ);
+        double flatDistToNext = xAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().getPositionVec().x) + zAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().getPositionVec().z);
-        double sideDist = zAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().posX) + xAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().posZ);
+        double sideDist = zAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().getPositionVec().x) + xAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().getPositionVec().z);
 
         double lateralMotion = xAxis * ctx.player().getMotion().z + zAxis * ctx.player().getMotion().x;
         if (Math.abs(lateralMotion) > 0.1) {

src/main/java/baritone/pathing/movement/movements/MovementDescend.java

@@ -212,11 +212,11 @@ public class MovementDescend extends Movement {
 
         BlockPos playerFeet = ctx.playerFeet();
         BlockPos fakeDest = new BlockPos(dest.getX() * 2 - src.getX(), dest.getY(), dest.getZ() * 2 - src.getZ());
-        if ((playerFeet.equals(dest) || playerFeet.equals(fakeDest)) && (MovementHelper.isLiquid(ctx, dest) || ctx.player().posY - dest.getY() < 0.5)) { // lilypads
+        if ((playerFeet.equals(dest) || playerFeet.equals(fakeDest)) && (MovementHelper.isLiquid(ctx, dest) || ctx.player().getPositionVec().y - dest.getY() < 0.5)) { // lilypads
             // Wait until we're actually on the ground before saying we're done because sometimes we continue to fall if the next action starts immediately
             return state.setStatus(MovementStatus.SUCCESS);
             /* else {
-                // System.out.println(player().posY + " " + playerFeet.getY() + " " + (player().posY - playerFeet.getY()));
+                // System.out.println(player().getPositionVec().y + " " + playerFeet.getY() + " " + (player().getPositionVec().y - playerFeet.getY()));
             }*/
         }
         if (safeMode()) {
@@ -231,11 +231,11 @@ public class MovementDescend extends Movement {
             )).setInput(Input.MOVE_FORWARD, true);
             return state;
         }
-        double diffX = ctx.player().posX - (dest.getX() + 0.5);
+        double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5);
-        double diffZ = ctx.player().posZ - (dest.getZ() + 0.5);
+        double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5);
         double ab = Math.sqrt(diffX * diffX + diffZ * diffZ);
-        double x = ctx.player().posX - (src.getX() + 0.5);
+        double x = ctx.player().getPositionVec().x - (src.getX() + 0.5);
-        double z = ctx.player().posZ - (src.getZ() + 0.5);
+        double z = ctx.player().getPositionVec().z - (src.getZ() + 0.5);
         double fromStart = Math.sqrt(x * x + z * z);
         if (!playerFeet.equals(dest) || ab > 0.25) {
             if (numTicks++ < 20 && fromStart < 1.25) {

src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java

@@ -226,7 +226,7 @@ public class MovementDiagonal extends Movement {
         } else if (!playerInValidPosition() && !(MovementHelper.isLiquid(ctx, src) && getValidPositions().contains(ctx.playerFeet().up()))) {
             return state.setStatus(MovementStatus.UNREACHABLE);
         }
-        if (dest.y > src.y && ctx.player().posY < src.y + 0.1 && ctx.player().collidedHorizontally) {
+        if (dest.y > src.y && ctx.player().getPositionVec().y < src.y + 0.1 && ctx.player().collidedHorizontally) {
             state.setInput(Input.JUMP, true);
         }
         if (sprint()) {

src/main/java/baritone/pathing/movement/movements/MovementDownward.java

@@ -84,8 +84,8 @@ public class MovementDownward extends Movement {
         } else if (!playerInValidPosition()) {
             return state.setStatus(MovementStatus.UNREACHABLE);
         }
-        double diffX = ctx.player().posX - (dest.getX() + 0.5);
+        double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5);
-        double diffZ = ctx.player().posZ - (dest.getZ() + 0.5);
+        double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5);
         double ab = Math.sqrt(diffX * diffX + diffZ * diffZ);
 
         if (numTicks++ < 10 && ab < 0.2) {

src/main/java/baritone/pathing/movement/movements/MovementFall.java

@@ -100,7 +100,7 @@ public class MovementFall extends Movement {
                 return state.setStatus(MovementStatus.UNREACHABLE);
             }
 
-            if (ctx.player().posY - dest.getY() < ctx.playerController().getBlockReachDistance() && !ctx.player().onGround) {
+            if (ctx.player().getPositionVec().y - dest.getY() < ctx.playerController().getBlockReachDistance() && !ctx.player().onGround) {
                 ctx.player().inventory.currentItem = ctx.player().inventory.getSlotFor(STACK_BUCKET_WATER);
 
                 targetRotation = new Rotation(toDest.getYaw(), 90.0F);
@@ -115,7 +115,7 @@ public class MovementFall extends Movement {
         } else {
             state.setTarget(new MovementTarget(toDest, false));
         }
-        if (playerFeet.equals(dest) && (ctx.player().posY - playerFeet.getY() < 0.094 || isWater)) { // 0.094 because lilypads
+        if (playerFeet.equals(dest) && (ctx.player().getPositionVec().y - playerFeet.getY() < 0.094 || isWater)) { // 0.094 because lilypads
             if (isWater) { // only match water, not flowing water (which we cannot pick up with a bucket)
                 if (PlayerInventory.isHotbar(ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY))) {
                     ctx.player().inventory.currentItem = ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY);
@@ -134,7 +134,7 @@ public class MovementFall extends Movement {
             }
         }
         Vec3d destCenter = VecUtils.getBlockPosCenter(dest); // we are moving to the 0.5 center not the edge (like if we were falling on a ladder)
-        if (Math.abs(ctx.player().posX + ctx.player().getMotion().x - destCenter.x) > 0.1 || Math.abs(ctx.player().posZ + ctx.player().getMotion().z - destCenter.z) > 0.1) {
+        if (Math.abs(ctx.player().getPositionVec().x + ctx.player().getMotion().x - destCenter.x) > 0.1 || Math.abs(ctx.player().getPositionVec().z + ctx.player().getMotion().z - destCenter.z) > 0.1) {
             if (!ctx.player().onGround && Math.abs(ctx.player().getMotion().y) > 0.4) {
                 state.setInput(Input.SNEAK, true);
             }
@@ -144,7 +144,7 @@ public class MovementFall extends Movement {
         if (avoid == null) {
             avoid = src.subtract(dest);
         } else {
-            double dist = Math.abs(avoid.getX() * (destCenter.x - avoid.getX() / 2.0 - ctx.player().posX)) + Math.abs(avoid.getZ() * (destCenter.z - avoid.getZ() / 2.0 - ctx.player().posZ));
+            double dist = Math.abs(avoid.getX() * (destCenter.x - avoid.getX() / 2.0 - ctx.player().getPositionVec().x)) + Math.abs(avoid.getZ() * (destCenter.z - avoid.getZ() / 2.0 - ctx.player().getPositionVec().z));
             if (dist < 0.6) {
                 state.setInput(Input.MOVE_FORWARD, true);
             } else if (!ctx.player().onGround) {

src/main/java/baritone/pathing/movement/movements/MovementParkour.java

@@ -246,19 +246,19 @@ public class MovementParkour extends Movement {
                 // but i did it anyway
                 return state.setStatus(MovementStatus.SUCCESS);
             }
-            if (ctx.player().posY - ctx.playerFeet().getY() < 0.094) { // lilypads
+            if (ctx.player().getPositionVec().y - ctx.playerFeet().getY() < 0.094) { // lilypads
                 state.setStatus(MovementStatus.SUCCESS);
             }
         } else if (!ctx.playerFeet().equals(src)) {
-            if (ctx.playerFeet().equals(src.offset(direction)) || ctx.player().posY - src.y > 0.0001) {
+            if (ctx.playerFeet().equals(src.offset(direction)) || ctx.player().getPositionVec().y - src.y > 0.0001) {
                 if (!MovementHelper.canWalkOn(ctx, dest.down()) && !ctx.player().onGround && MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), true) == PlaceResult.READY_TO_PLACE) {
                     // go in the opposite order to check DOWN before all horizontals -- down is preferable because you don't have to look to the side while in midair, which could mess up the trajectory
                     state.setInput(Input.CLICK_RIGHT, true);
                 }
                 // prevent jumping too late by checking for ascend
                 if (dist == 3 && !ascend) { // this is a 2 block gap, dest = src + direction * 3
-                    double xDiff = (src.x + 0.5) - ctx.player().posX;
+                    double xDiff = (src.x + 0.5) - ctx.player().getPositionVec().x;
-                    double zDiff = (src.z + 0.5) - ctx.player().posZ;
+                    double zDiff = (src.z + 0.5) - ctx.player().getPositionVec().z;
                     double distFromStart = Math.max(Math.abs(xDiff), Math.abs(zDiff));
                     if (distFromStart < 0.7) {
                         return state;

src/main/java/baritone/pathing/movement/movements/MovementPillar.java

@@ -172,7 +172,7 @@ public class MovementPillar extends Movement {
             // stay centered while swimming up a water column
             state.setTarget(new MovementState.MovementTarget(RotationUtils.calcRotationFromVec3d(ctx.playerHead(), VecUtils.getBlockPosCenter(dest), ctx.playerRotations()), false));
             Vec3d destCenter = VecUtils.getBlockPosCenter(dest);
-            if (Math.abs(ctx.player().posX - destCenter.x) > 0.2 || Math.abs(ctx.player().posZ - destCenter.z) > 0.2) {
+            if (Math.abs(ctx.player().getPositionVec().x - destCenter.x) > 0.2 || Math.abs(ctx.player().getPositionVec().z - destCenter.z) > 0.2) {
                 state.setInput(Input.MOVE_FORWARD, true);
             }
             if (ctx.playerFeet().equals(dest)) {
@@ -218,11 +218,11 @@ public class MovementPillar extends Movement {
             }
 
 
-            state.setInput(Input.SNEAK, ctx.player().posY > dest.getY() || ctx.player().posY < src.getY() + 0.2D); // delay placement by 1 tick for ncp compatibility
+            state.setInput(Input.SNEAK, ctx.player().getPositionVec().y > dest.getY() || ctx.player().getPositionVec().y < src.getY() + 0.2D); // delay placement by 1 tick for ncp compatibility
             // since (lower down) we only right click once player.isSneaking, and that happens the tick after we request to sneak
 
-            double diffX = ctx.player().posX - (dest.getX() + 0.5);
+            double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5);
-            double diffZ = ctx.player().posZ - (dest.getZ() + 0.5);
+            double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5);
             double dist = Math.sqrt(diffX * diffX + diffZ * diffZ);
             double flatMotion = Math.sqrt(ctx.player().getMotion().x * ctx.player().getMotion().x + ctx.player().getMotion().z * ctx.player().getMotion().z);
             if (dist > 0.17) {//why 0.17? because it seemed like a good number, that's why
@@ -236,7 +236,7 @@ public class MovementPillar extends Movement {
                 state.setTarget(new MovementState.MovementTarget(rotation, true));
             } else if (flatMotion < 0.05) {
                 // If our Y coordinate is above our goal, stop jumping
-                state.setInput(Input.JUMP, ctx.player().posY < dest.getY());
+                state.setInput(Input.JUMP, ctx.player().getPositionVec().y < dest.getY());
             }
 
 
@@ -251,7 +251,7 @@ public class MovementPillar extends Movement {
                     state.setInput(Input.JUMP, false); // breaking is like 5x slower when you're jumping
                     state.setInput(Input.CLICK_LEFT, true);
                     blockIsThere = false;
-                } else if (ctx.player().isSneaking() && (ctx.isLookingAt(src.down()) || ctx.isLookingAt(src)) && ctx.player().posY > dest.getY() + 0.1) {
+                } else if (ctx.player().isCrouching() && (ctx.isLookingAt(src.down()) || ctx.isLookingAt(src)) && ctx.player().getPositionVec().y > dest.getY() + 0.1) {
                     state.setInput(Input.CLICK_RIGHT, true);
                 }
             }

src/main/java/baritone/pathing/movement/movements/MovementTraverse.java

@@ -175,7 +175,7 @@ public class MovementTraverse extends Movement {
                 return state;
             }
             // and we aren't already pressed up against the block
-            double dist = Math.max(Math.abs(ctx.player().posX - (dest.getX() + 0.5D)), Math.abs(ctx.player().posZ - (dest.getZ() + 0.5D)));
+            double dist = Math.max(Math.abs(ctx.player().getPositionVec().x - (dest.getX() + 0.5D)), Math.abs(ctx.player().getPositionVec().z - (dest.getZ() + 0.5D)));
             if (dist < 0.83) {
                 return state;
             }
@@ -245,7 +245,7 @@ public class MovementTraverse extends Movement {
             }
             Block low = BlockStateInterface.get(ctx, src).getBlock();
             Block high = BlockStateInterface.get(ctx, src.up()).getBlock();
-            if (ctx.player().posY > src.y + 0.1D && !ctx.player().onGround && (low == Blocks.VINE || low == Blocks.LADDER || high == Blocks.VINE || high == Blocks.LADDER)) {
+            if (ctx.player().getPositionVec().y > src.y + 0.1D && !ctx.player().onGround && (low == Blocks.VINE || low == Blocks.LADDER || high == Blocks.VINE || high == Blocks.LADDER)) {
                 // hitting W could cause us to climb the ladder instead of going forward
                 // wait until we're on the ground
                 return state;
@@ -272,21 +272,21 @@ public class MovementTraverse extends Movement {
             wasTheBridgeBlockAlwaysThere = false;
             Block standingOn = BlockStateInterface.get(ctx, feet.down()).getBlock();
             if (standingOn.equals(Blocks.SOUL_SAND) || standingOn instanceof SlabBlock) { // see issue #118
-                double dist = Math.max(Math.abs(dest.getX() + 0.5 - ctx.player().posX), Math.abs(dest.getZ() + 0.5 - ctx.player().posZ));
+                double dist = Math.max(Math.abs(dest.getX() + 0.5 - ctx.player().getPositionVec().x), Math.abs(dest.getZ() + 0.5 - ctx.player().getPositionVec().z));
                 if (dist < 0.85) { // 0.5 + 0.3 + epsilon
                     MovementHelper.moveTowards(ctx, state, dest);
                     return state.setInput(Input.MOVE_FORWARD, false)
                             .setInput(Input.MOVE_BACK, true);
                 }
             }
-            double dist1 = Math.max(Math.abs(ctx.player().posX - (dest.getX() + 0.5D)), Math.abs(ctx.player().posZ - (dest.getZ() + 0.5D)));
+            double dist1 = Math.max(Math.abs(ctx.player().getPositionVec().x - (dest.getX() + 0.5D)), Math.abs(ctx.player().getPositionVec().z - (dest.getZ() + 0.5D)));
             PlaceResult p = MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false);
             if ((p == PlaceResult.READY_TO_PLACE || dist1 < 0.6) && !Baritone.settings().assumeSafeWalk.value) {
                 state.setInput(Input.SNEAK, true);
             }
             switch (p) {
                 case READY_TO_PLACE: {
-                    if (ctx.player().isSneaking() || Baritone.settings().assumeSafeWalk.value) {
+                    if (ctx.player().isCrouching() || Baritone.settings().assumeSafeWalk.value) {
                         state.setInput(Input.CLICK_RIGHT, true);
                     }
                     return state;
@@ -319,7 +319,7 @@ public class MovementTraverse extends Movement {
 
                 Rotation backToFace = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations());
                 float pitch = backToFace.getPitch();
-                double dist2 = Math.max(Math.abs(ctx.player().posX - faceX), Math.abs(ctx.player().posZ - faceZ));
+                double dist2 = Math.max(Math.abs(ctx.player().getPositionVec().x - faceX), Math.abs(ctx.player().getPositionVec().z - faceZ));
                 if (dist2 < 0.29) { // see issue #208
                     float yaw = RotationUtils.calcRotationFromVec3d(VecUtils.getBlockPosCenter(dest), ctx.playerHead(), ctx.playerRotations()).getYaw();
                     state.setTarget(new MovementState.MovementTarget(new Rotation(yaw, pitch), true));

src/main/java/baritone/pathing/path/PathExecutor.java

@@ -414,7 +414,7 @@ public class PathExecutor implements IPathExecutor, Helper {
                 // playerFeet adds 0.1251 to account for soul sand
                 // farmland is 0.9375
                 // 0.07 is to account for farmland
-                if (ctx.player().posY >= center.getY() - 0.07) {
+                if (ctx.player().getPositionVec().y >= center.getY() - 0.07) {
                     behavior.baritone.getInputOverrideHandler().setInputForceState(Input.JUMP, false);
                     return true;
                 }
@@ -485,7 +485,7 @@ public class PathExecutor implements IPathExecutor, Helper {
     }
 
     private static boolean skipNow(IPlayerContext ctx, IMovement current) {
-        double offTarget = Math.abs(current.getDirection().getX() * (current.getSrc().z + 0.5D - ctx.player().posZ)) + Math.abs(current.getDirection().getZ() * (current.getSrc().x + 0.5D - ctx.player().posX));
+        double offTarget = Math.abs(current.getDirection().getX() * (current.getSrc().z + 0.5D - ctx.player().getPositionVec().z)) + Math.abs(current.getDirection().getZ() * (current.getSrc().x + 0.5D - ctx.player().getPositionVec().x));
         if (offTarget > 0.1) {
             return false;
         }
@@ -495,7 +495,7 @@ public class PathExecutor implements IPathExecutor, Helper {
             return true;
         }
         // wait 0.3
-        double flatDist = Math.abs(current.getDirection().getX() * (headBonk.getX() + 0.5D - ctx.player().posX)) + Math.abs(current.getDirection().getZ() * (headBonk.getZ() + 0.5 - ctx.player().posZ));
+        double flatDist = Math.abs(current.getDirection().getX() * (headBonk.getX() + 0.5D - ctx.player().getPositionVec().x)) + Math.abs(current.getDirection().getZ() * (headBonk.getZ() + 0.5 - ctx.player().getPositionVec().z));
         return flatDist > 0.8;
     }
 

src/main/java/baritone/process/BuilderProcess.java

@@ -445,7 +445,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
             BetterBlockPos pos = toBreak.get().getA();
             baritone.getLookBehavior().updateTarget(rot, true);
             MovementHelper.switchToBestToolFor(ctx, bcc.get(pos));
-            if (ctx.player().isSneaking()) {
+            if (ctx.player().isCrouching()) {
                 // really horrible bug where a block is visible for breaking while sneaking but not otherwise
                 // so you can't see it, it goes to place something else, sneaks, then the next tick it tries to break
                 // and is unable since it's unsneaked in the intermediary tick
@@ -781,7 +781,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
                 continue;
             }
             // <toxic cloud>
-            result.add(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().posX, ctx.player().posY, ctx.player().posZ), Direction.UP, ctx.playerFeet(), false)) {})));
+            result.add(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().getPositionVec().x, ctx.player().getPositionVec().y, ctx.player().getPositionVec().z), Direction.UP, ctx.playerFeet(), false)) {})));
             // </toxic cloud>
         }
         return result;

src/main/java/baritone/process/FarmProcess.java

@@ -282,7 +282,7 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro
                 ItemEntity ei = (ItemEntity) entity;
                 if (PICKUP_DROPPED.contains(ei.getItem().getItem())) {
                     // +0.1 because of farmland's 0.9375 dummy height lol
-                    goalz.add(new GoalBlock(new BlockPos(entity.posX, entity.posY + 0.1, entity.posZ)));
+                    goalz.add(new GoalBlock(new BlockPos(entity.getPositionVec().x, entity.getPositionVec().y + 0.1, entity.getPositionVec().z)));
                 }
             }
         }

src/main/java/baritone/process/FollowProcess.java

@@ -60,7 +60,7 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo
             pos = new BlockPos(following);
         } else {
             GoalXZ g = GoalXZ.fromDirection(following.getPositionVector(), Baritone.settings().followOffsetDirection.value, Baritone.settings().followOffsetDistance.value);
-            pos = new BlockPos(g.getX(), following.posY, g.getZ());
+            pos = new BlockPos(g.getX(), following.getPositionVec().y, g.getZ());
         }
         return new GoalNear(pos, Baritone.settings().followRadius.value);
     }

src/main/java/baritone/process/MineProcess.java

@@ -36,7 +36,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.ItemEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
-import org.hydev.hyritone.Hyritone;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -320,53 +319,39 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
     public static List<BlockPos> searchWorld(CalculationContext ctx, BlockOptionalMetaLookup filter, int max, List<BlockPos> alreadyKnown, List<BlockPos> blacklist, List<BlockPos> dropped) {
         List<BlockPos> locs = new ArrayList<>();
         List<Block> untracked = new ArrayList<>();
+        for (BlockOptionalMeta bom : filter.blocks()) {
+            Block block = bom.getBlock();
+            if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(block)) {
+                BetterBlockPos pf = ctx.baritone.getPlayerContext().playerFeet();
 
-        // Check mine with seed
+                // maxRegionDistanceSq 2 means adjacent directly or adjacent diagonally; nothing further than that
-        if (!Baritone.settings().mineWithSeed.value)
+                locs.addAll(ctx.worldData.getCachedWorld().getLocationsOf(
-        {
-            // Search the actual world
-            for (BlockOptionalMeta bom : filter.blocks()) {
-                Block block = bom.getBlock();
-                if (CachedChunk.BLOCKS_TO_KEEP_TRACK_OF.contains(block)) {
-                    BetterBlockPos pf = ctx.baritone.getPlayerContext().playerFeet();
-
-                    // maxRegionDistanceSq 2 means adjacent directly or adjacent diagonally; nothing further than that
-                    locs.addAll(ctx.worldData.getCachedWorld().getLocationsOf(
                         BlockUtils.blockToString(block),
                         Baritone.settings().maxCachedWorldScanCount.value,
                         pf.x,
                         pf.z,
                         2
-                    ));
+                ));
-                } else {
+            } else {
-                    untracked.add(block);
+                untracked.add(block);
-                }
             }
+        }
 
-            locs = prune(ctx, locs, filter, max, blacklist, dropped);
+        locs = prune(ctx, locs, filter, max, blacklist, dropped);
 
-            if (!untracked.isEmpty() || (Baritone.settings().extendCacheOnThreshold.value && locs.size() < max)) {
+        if (!untracked.isEmpty() || (Baritone.settings().extendCacheOnThreshold.value && locs.size() < max)) {
-                locs.addAll(WorldScanner.INSTANCE.scanChunkRadius(
+            locs.addAll(WorldScanner.INSTANCE.scanChunkRadius(
                     ctx.getBaritone().getPlayerContext(),
                     filter,
                     max,
                     10,
                     32
-                )); // maxSearchRadius is NOT sq
+            )); // maxSearchRadius is NOT sq
-            }
-
-            locs.addAll(alreadyKnown);
-
-            return prune(ctx, locs, filter, max, blacklist, dropped);
-        }
-        else
-        {
-            // Add seed ores
-            locs.addAll(Hyritone.seedServerCache.cacheBlocks);
-            locs = prune(ctx, locs, filter, max, blacklist, dropped);
         }
 
-        return locs;
+        locs.addAll(alreadyKnown);
+
+        return prune(ctx, locs, filter, max, blacklist, dropped);
     }
 
     private void addNearby() {
@@ -407,10 +392,7 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
                 .distinct()
 
                 // remove any that are within loaded chunks that aren't actually what we want
-                .filter(pos -> Baritone.settings().mineWithSeed.value || !ctx.bsi.worldContainsLoadedChunk(pos.getX(), pos.getZ()) || filter.has(ctx.get(pos.getX(), pos.getY(), pos.getZ())) || dropped.contains(pos))
+                .filter(pos -> !ctx.bsi.worldContainsLoadedChunk(pos.getX(), pos.getZ()) || filter.has(ctx.get(pos.getX(), pos.getY(), pos.getZ())) || dropped.contains(pos))
-
-                // Hyritone: remove air
-                .filter(pos -> !Baritone.settings().mineWithSeed.value || !ctx.get(pos).isAir() || dropped.contains(pos))
 
                 // remove any that are implausible to mine (encased in bedrock, or touching lava)
                 .filter(pos -> MineProcess.plausibleToBreak(ctx, pos))
@@ -443,15 +425,11 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
     @Override
     public void mine(int quantity, BlockOptionalMetaLookup filter) {
         this.filter = filter;
-
+        if (filter != null && !Baritone.settings().allowBreak.value) {
-        // Hyritone start - #1: Users are not idiots, if they disabled allow break, it's not for mining.
-        /*if (filter != null && !settings().allowBreak.value) {
             logDirect("Unable to mine when allowBreak is false!");
             this.mine(quantity, (BlockOptionalMetaLookup) null);
             return;
-        }*/
+        }
-        // Hyritone end
-
         this.desiredQuantity = quantity;
         this.knownOreLocations = new ArrayList<>();
         this.blacklist = new ArrayList<>();

src/main/java/baritone/selection/SelectionRenderer.java

@@ -5,6 +5,7 @@ import baritone.api.event.events.RenderEvent;
 import baritone.api.event.listener.AbstractGameEventListener;
 import baritone.api.selection.ISelection;
 import baritone.utils.IRenderer;
+import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.util.math.AxisAlignedBB;
 
 public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
@@ -18,7 +19,7 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
         baritone.getGameEventHandler().registerEventListener(this);
     }
 
-    public static void renderSelections(ISelection[] selections) {
+    public static void renderSelections(MatrixStack stack, ISelection[] selections) {
         float opacity = settings.selectionOpacity.value;
         boolean ignoreDepth = settings.renderSelectionIgnoreDepth.value;
         float lineWidth = settings.selectionLineWidth.value;
@@ -30,20 +31,20 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
         IRenderer.startLines(settings.colorSelection.value, opacity, lineWidth, ignoreDepth);
 
         for (ISelection selection : selections) {
-            IRenderer.drawAABB(selection.aabb(), SELECTION_BOX_EXPANSION);
+            IRenderer.drawAABB(stack, selection.aabb(), SELECTION_BOX_EXPANSION);
         }
 
         if (settings.renderSelectionCorners.value) {
             IRenderer.glColor(settings.colorSelectionPos1.value, opacity);
 
             for (ISelection selection : selections) {
-                IRenderer.drawAABB(new AxisAlignedBB(selection.pos1(), selection.pos1().add(1, 1, 1)));
+                IRenderer.drawAABB(stack, new AxisAlignedBB(selection.pos1(), selection.pos1().add(1, 1, 1)));
             }
 
             IRenderer.glColor(settings.colorSelectionPos2.value, opacity);
 
             for (ISelection selection : selections) {
-                IRenderer.drawAABB(new AxisAlignedBB(selection.pos2(), selection.pos2().add(1, 1, 1)));
+                IRenderer.drawAABB(stack, new AxisAlignedBB(selection.pos2(), selection.pos2().add(1, 1, 1)));
             }
         }
 
@@ -52,6 +53,6 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
 
     @Override
     public void onRenderPass(RenderEvent event) {
-        renderSelections(manager.getSelections());
+        renderSelections(event.getModelViewStack(), manager.getSelections());
     }
 }

src/main/java/baritone/utils/BlockStateInterface.java

@@ -33,9 +33,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkSection;
 import net.minecraft.world.chunk.ChunkStatus;
-import org.hydev.hyritone.Hyritone;
-
-import static org.hydev.hyritone.utils.MiscUtils.posId;
 
 /**
  * Wraps get for chuck caching capability
@@ -47,7 +44,7 @@ public class BlockStateInterface {
     private final ClientChunkProvider provider;
     private final WorldData worldData;
     protected final IBlockReader world;
-    public final BlockPos.MutableBlockPos isPassableBlockPos;
+    public final BlockPos.Mutable isPassableBlockPos;
     public final IBlockReader access;
 
     private Chunk prev = null;
@@ -77,7 +74,7 @@ public class BlockStateInterface {
         if (!Minecraft.getInstance().isOnExecutionThread()) {
             throw new IllegalStateException();
         }
-        this.isPassableBlockPos = new BlockPos.MutableBlockPos();
+        this.isPassableBlockPos = new BlockPos.Mutable();
         this.access = new BlockStateInterfaceAccessWrapper(this);
     }
 
@@ -106,16 +103,6 @@ public class BlockStateInterface {
             return AIR;
         }
 
-        // Hyritone: Replace the block with seed block
-        if (Baritone.settings().mineWithSeed.value)
-        {
-            String key = posId(new BlockPos(x, y, z));
-            if (Hyritone.seedServerCache.blocksMap.containsKey(key))
-            {
-                return Hyritone.seedServerCache.blocksMap.get(key);
-            }
-        }
-
         if (useTheRealWorld) {
             Chunk cached = prev;
             // there's great cache locality in block state lookups

src/main/java/baritone/utils/GuiClick.java

@@ -23,21 +23,20 @@ import baritone.api.pathing.goals.GoalBlock;
 import baritone.api.pathing.goals.GoalTwoBlocks;
 import baritone.api.utils.BetterBlockPos;
 import baritone.api.utils.Helper;
-import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.renderer.Matrix4f;
+import net.minecraft.client.renderer.Vector4f;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.*;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.GL11;
 
 import java.awt.*;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
 import java.util.Collections;
 
 import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
@@ -45,11 +44,7 @@ import static org.lwjgl.opengl.GL11.*;
 
 public class GuiClick extends Screen implements Helper {
 
-    // My name is Brady and I grant leijurv permission to use this pasted code
+    private Matrix4f projectionViewMatrix;
-    private final FloatBuffer MODELVIEW = BufferUtils.createFloatBuffer(16);
-    private final FloatBuffer PROJECTION = BufferUtils.createFloatBuffer(16);
-    private final IntBuffer VIEWPORT = BufferUtils.createIntBuffer(16);
-    private final FloatBuffer TO_WORLD_BUFFER = BufferUtils.createFloatBuffer(3);
 
     private BlockPos clickStart;
     private BlockPos currentMouseOver;
@@ -67,9 +62,10 @@ public class GuiClick extends Screen implements Helper {
     public void render(int mouseX, int mouseY, float partialTicks) {
         double mx = mc.mouseHelper.getMouseX();
         double my = mc.mouseHelper.getMouseY();
-        my = mc.mainWindow.getHeight() - my;
+
-        my *= mc.mainWindow.getFramebufferHeight() / (double) mc.mainWindow.getHeight();
+        my = mc.getMainWindow().getHeight() - my;
-        mx *= mc.mainWindow.getFramebufferWidth() / (double) mc.mainWindow.getWidth();
+        my *= mc.getMainWindow().getFramebufferHeight() / (double) mc.getMainWindow().getHeight();
+        mx *= mc.getMainWindow().getFramebufferWidth() / (double) mc.getMainWindow().getWidth();
         Vec3d near = toWorld(mx, my, 0);
         Vec3d far = toWorld(mx, my, 1); // "Use 0.945 that's what stack overflow says" - leijurv
         if (near != null && far != null) {
@@ -114,224 +110,52 @@ public class GuiClick extends Screen implements Helper {
         return super.mouseClicked(mouseX, mouseY, mouseButton);
     }
 
-    public void onRender() {
+    public void onRender(MatrixStack modelViewStack, MatrixStack projectionStack) {
-        GlStateManager.getMatrix(GL_MODELVIEW_MATRIX, (FloatBuffer) MODELVIEW.clear());
+        this.projectionViewMatrix = projectionStack.getLast().getPositionMatrix().copy();
-        GlStateManager.getMatrix(GL_PROJECTION_MATRIX, (FloatBuffer) PROJECTION.clear());
+        this.projectionViewMatrix.multiply(modelViewStack.getLast().getPositionMatrix());
-        GL11.glGetIntegerv(GL_VIEWPORT, (IntBuffer) VIEWPORT.clear());
+        this.projectionViewMatrix.invert();
 
         if (currentMouseOver != null) {
             Entity e = mc.getRenderViewEntity();
             // drawSingleSelectionBox WHEN?
-            PathRenderer.drawManySelectionBoxes(e, Collections.singletonList(currentMouseOver), Color.CYAN);
+            PathRenderer.drawManySelectionBoxes(modelViewStack, e, Collections.singletonList(currentMouseOver), Color.CYAN);
             if (clickStart != null && !clickStart.equals(currentMouseOver)) {
-                GlStateManager.enableBlend();
+                RenderSystem.enableBlend();
-                GlStateManager.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
+                RenderSystem.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
-                GlStateManager.color4f(Color.RED.getColorComponents(null)[0], Color.RED.getColorComponents(null)[1], Color.RED.getColorComponents(null)[2], 0.4F);
+                RenderSystem.color4f(Color.RED.getColorComponents(null)[0], Color.RED.getColorComponents(null)[1], Color.RED.getColorComponents(null)[2], 0.4F);
-                GlStateManager.lineWidth(Baritone.settings().pathRenderLineWidthPixels.value);
+                RenderSystem.lineWidth(Baritone.settings().pathRenderLineWidthPixels.value);
-                GlStateManager.disableTexture();
+                RenderSystem.disableTexture();
-                GlStateManager.depthMask(false);
+                RenderSystem.depthMask(false);
-                GlStateManager.disableDepthTest();
+                RenderSystem.disableDepthTest();
                 BetterBlockPos a = new BetterBlockPos(currentMouseOver);
                 BetterBlockPos b = new BetterBlockPos(clickStart);
-                IRenderer.drawAABB(new AxisAlignedBB(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.min(a.z, b.z), Math.max(a.x, b.x) + 1, Math.max(a.y, b.y) + 1, Math.max(a.z, b.z) + 1));
+                IRenderer.drawAABB(modelViewStack, new AxisAlignedBB(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.min(a.z, b.z), Math.max(a.x, b.x) + 1, Math.max(a.y, b.y) + 1, Math.max(a.z, b.z) + 1));
-                GlStateManager.enableDepthTest();
+                RenderSystem.enableDepthTest();
 
-                GlStateManager.depthMask(true);
+                RenderSystem.depthMask(true);
-                GlStateManager.enableTexture();
+                RenderSystem.enableTexture();
-                GlStateManager.disableBlend();
+                RenderSystem.disableBlend();
             }
         }
     }
 
     private Vec3d toWorld(double x, double y, double z) {
-        boolean result = gluUnProject((float) x, (float) y, (float) z, MODELVIEW, PROJECTION, VIEWPORT, (FloatBuffer) TO_WORLD_BUFFER.clear());
+        if (this.projectionViewMatrix == null) {
-        if (result) {
+            return null;
-            return new Vec3d(TO_WORLD_BUFFER.get(0), TO_WORLD_BUFFER.get(1), TO_WORLD_BUFFER.get(2));
         }
-        return null;
-    }
 
-    // skidded from lwjgl2 :ok_hand:
+        x /= mc.getMainWindow().getWidth();
-    // its uhhhhh mit license so its ok
+        y /= mc.getMainWindow().getHeight();
-    // here is the uhh license
+        x = x * 2 - 1;
-    /*
+        y = y * 2 - 1;
-     * Copyright (c) 2002-2007 Lightweight Java Game Library Project
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without
-     * modification, are permitted provided that the following conditions are
-     * met:
-     *
-     * * Redistributions of source code must retain the above copyright
-     *   notice, this list of conditions and the following disclaimer.
-     *
-     * * Redistributions in binary form must reproduce the above copyright
-     *   notice, this list of conditions and the following disclaimer in the
-     *   documentation and/or other materials provided with the distribution.
-     *
-     * * Neither the name of 'Light Weight Java Game Library' nor the names of
-     *   its contributors may be used to endorse or promote products derived
-     *   from this software without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-     * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-     * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-     * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-     * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-     * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-     * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-     * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-     * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-     * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-     */
-
-    public static boolean gluUnProject(
-            float winx,
-            float winy,
-            float winz,
-            FloatBuffer modelMatrix,
-            FloatBuffer projMatrix,
-            IntBuffer viewport,
-            FloatBuffer obj_pos) {
-        FloatBuffer finalMatrix = BufferUtils.createFloatBuffer(16);
-        float[] in = new float[4];
-        float[] out = new float[4];
-
-        __gluMultMatricesf(modelMatrix, projMatrix, finalMatrix);
-
-        if (!__gluInvertMatrixf(finalMatrix, finalMatrix))
-            return false;
-
-        in[0] = winx;
-        in[1] = winy;
-        in[2] = winz;
-        in[3] = 1.0f;
-
-        // Map x and y from window coordinates
-        in[0] = (in[0] - viewport.get(viewport.position() + 0)) / viewport.get(viewport.position() + 2);
-        in[1] = (in[1] - viewport.get(viewport.position() + 1)) / viewport.get(viewport.position() + 3);
-
-        // Map to range -1 to 1
-        in[0] = in[0] * 2 - 1;
-        in[1] = in[1] * 2 - 1;
-        in[2] = in[2] * 2 - 1;
-
-        __gluMultMatrixVecf(finalMatrix, in, out);
-
-        if (out[3] == 0.0)
-            return false;
-
-        out[3] = 1.0f / out[3];
-
-        obj_pos.put(obj_pos.position() + 0, out[0] * out[3]);
-        obj_pos.put(obj_pos.position() + 1, out[1] * out[3]);
-        obj_pos.put(obj_pos.position() + 2, out[2] * out[3]);
-
-        return true;
-    }
-
-    private static void __gluMultMatrixVecf(FloatBuffer m, float[] in, float[] out) {
-        for (int i = 0; i < 4; i++) {
-            out[i] =
-                    in[0] * m.get(m.position() + 0 * 4 + i)
-                            + in[1] * m.get(m.position() + 1 * 4 + i)
-                            + in[2] * m.get(m.position() + 2 * 4 + i)
-                            + in[3] * m.get(m.position() + 3 * 4 + i);
 
+        Vector4f pos = new Vector4f((float) x, (float) y, (float) z, 1.0F);
+        pos.transform(this.projectionViewMatrix);
+        if (pos.getW() == 0) {
+            return null;
         }
-    }
 
-    private static void __gluMultMatricesf(FloatBuffer a, FloatBuffer b, FloatBuffer r) {
+        pos.perspectiveDivide();
-        for (int i = 0; i < 4; i++) {
+        return new Vec3d(pos.getX(), pos.getY(), pos.getZ());
-            for (int j = 0; j < 4; j++) {
-                r.put(r.position() + i * 4 + j,
-                        a.get(a.position() + i * 4 + 0) * b.get(b.position() + 0 * 4 + j) + a.get(a.position() + i * 4 + 1) * b.get(b.position() + 1 * 4 + j) + a.get(a.position() + i * 4 + 2) * b.get(b.position() + 2 * 4 + j) + a.get(a.position() + i * 4 + 3) * b.get(b.position() + 3 * 4 + j));
-            }
-        }
-    }
-
-    private static boolean __gluInvertMatrixf(FloatBuffer src, FloatBuffer inverse) {
-        int i, j, k, swap;
-        float t;
-        FloatBuffer temp = BufferUtils.createFloatBuffer(16);
-
-
-        for (i = 0; i < 16; i++) {
-            temp.put(i, src.get(i + src.position()));
-        }
-        __gluMakeIdentityf(inverse);
-
-        for (i = 0; i < 4; i++) {
-            /*
-             * * Look for largest element in column
-             */
-            swap = i;
-            for (j = i + 1; j < 4; j++) {
-                /*
-                 * if (fabs(temp[j][i]) > fabs(temp[i][i])) { swap = j;
-                 */
-                if (Math.abs(temp.get(j * 4 + i)) > Math.abs(temp.get(i * 4 + i))) {
-                    swap = j;
-                }
-            }
-
-            if (swap != i) {
-                /*
-                 * * Swap rows.
-                 */
-                for (k = 0; k < 4; k++) {
-                    t = temp.get(i * 4 + k);
-                    temp.put(i * 4 + k, temp.get(swap * 4 + k));
-                    temp.put(swap * 4 + k, t);
-
-                    t = inverse.get(i * 4 + k);
-                    inverse.put(i * 4 + k, inverse.get(swap * 4 + k));
-                    //inverse.put((i << 2) + k, inverse.get((swap << 2) + k));
-                    inverse.put(swap * 4 + k, t);
-                    //inverse.put((swap << 2) + k, t);
-                }
-            }
-
-            if (temp.get(i * 4 + i) == 0) {
-                /*
-                 * * No non-zero pivot. The matrix is singular, which shouldn't *
-                 * happen. This means the user gave us a bad matrix.
-                 */
-                return false;
-            }
-
-            t = temp.get(i * 4 + i);
-            for (k = 0; k < 4; k++) {
-                temp.put(i * 4 + k, temp.get(i * 4 + k) / t);
-                inverse.put(i * 4 + k, inverse.get(i * 4 + k) / t);
-            }
-            for (j = 0; j < 4; j++) {
-                if (j != i) {
-                    t = temp.get(j * 4 + i);
-                    for (k = 0; k < 4; k++) {
-                        temp.put(j * 4 + k, temp.get(j * 4 + k) - temp.get(i * 4 + k) * t);
-                        inverse.put(j * 4 + k, inverse.get(j * 4 + k) - inverse.get(i * 4 + k) * t);
-						/*inverse.put(
-							(j << 2) + k,
-							inverse.get((j << 2) + k) - inverse.get((i << 2) + k) * t);*/
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    private static final float[] IDENTITY_MATRIX =
-            new float[]{
-                    1.0f, 0.0f, 0.0f, 0.0f,
-                    0.0f, 1.0f, 0.0f, 0.0f,
-                    0.0f, 0.0f, 1.0f, 0.0f,
-                    0.0f, 0.0f, 0.0f, 1.0f};
-
-    private static void __gluMakeIdentityf(FloatBuffer m) {
-        int oldPos = m.position();
-        m.put(IDENTITY_MATRIX);
-        m.position(oldPos);
     }
 }

src/main/java/baritone/utils/IRenderer.java

@@ -21,8 +21,10 @@ import baritone.api.BaritoneAPI;
 import baritone.api.Settings;
 import baritone.api.utils.Helper;
 import baritone.utils.accessor.IEntityRenderManager;
-import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.math.AxisAlignedBB;
@@ -40,20 +42,20 @@ public interface IRenderer {
 
     static void glColor(Color color, float alpha) {
         float[] colorComponents = color.getColorComponents(null);
-        GlStateManager.color4f(colorComponents[0], colorComponents[1], colorComponents[2], alpha);
+        RenderSystem.color4f(colorComponents[0], colorComponents[1], colorComponents[2], alpha);
     }
 
     static void startLines(Color color, float alpha, float lineWidth, boolean ignoreDepth) {
-        GlStateManager.enableBlend();
+        RenderSystem.enableBlend();
-        GlStateManager.disableLighting();
+        RenderSystem.disableLighting();
-        GlStateManager.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
+        RenderSystem.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
         glColor(color, alpha);
-        GlStateManager.lineWidth(lineWidth);
+        RenderSystem.lineWidth(lineWidth);
-        GlStateManager.disableTexture();
+        RenderSystem.disableTexture();
-        GlStateManager.depthMask(false);
+        RenderSystem.depthMask(false);
 
         if (ignoreDepth) {
-            GlStateManager.disableDepthTest();
+            RenderSystem.disableDepthTest();
         }
     }
 
@@ -63,50 +65,51 @@ public interface IRenderer {
 
     static void endLines(boolean ignoredDepth) {
         if (ignoredDepth) {
-            GlStateManager.enableDepthTest();
+            RenderSystem.enableDepthTest();
         }
 
-        GlStateManager.depthMask(true);
+        RenderSystem.depthMask(true);
-        GlStateManager.enableTexture();
+        RenderSystem.enableTexture();
-        GlStateManager.enableLighting();
+        RenderSystem.enableLighting();
-        GlStateManager.disableBlend();
+        RenderSystem.disableBlend();
     }
 
-    static void drawAABB(AxisAlignedBB aabb) {
+    static void drawAABB(MatrixStack stack, AxisAlignedBB aabb) {
         AxisAlignedBB toDraw = aabb.offset(-renderManager.renderPosX(), -renderManager.renderPosY(), -renderManager.renderPosZ());
 
+        Matrix4f matrix4f = stack.getLast().getPositionMatrix();
         buffer.begin(GL_LINES, DefaultVertexFormats.POSITION);
         // bottom
-        buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
         // top
-        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
         // corners
-        buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
-        buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex();
+        buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
         tessellator.draw();
     }
 
-    static void drawAABB(AxisAlignedBB aabb, double expand) {
+    static void drawAABB(MatrixStack stack, AxisAlignedBB aabb, double expand) {
-        drawAABB(aabb.grow(expand, expand, expand));
+        drawAABB(stack, aabb.grow(expand, expand, expand));
     }
 }

src/main/java/baritone/utils/PathRenderer.java

@@ -26,14 +26,17 @@ import baritone.api.utils.Helper;
 import baritone.api.utils.interfaces.IGoalRenderPos;
 import baritone.behavior.PathingBehavior;
 import baritone.pathing.path.PathExecutor;
-import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.tileentity.BeaconTileEntityRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.util.math.shapes.VoxelShapes;
 
@@ -71,7 +74,7 @@ public final class PathRenderer implements IRenderer, Helper {
         float partialTicks = event.getPartialTicks();
         Goal goal = behavior.getGoal();
         if (Helper.mc.currentScreen instanceof GuiClick) {
-            ((GuiClick) Helper.mc.currentScreen).onRender();
+            ((GuiClick) Helper.mc.currentScreen).onRender(event.getModelViewStack(), event.getProjectionStack());
         }
 
         int thisPlayerDimension = behavior.baritone.getPlayerContext().world().getDimension().getType().getId();
@@ -92,7 +95,7 @@ public final class PathRenderer implements IRenderer, Helper {
         }
 
         if (goal != null && settings.renderGoal.value) {
-            drawDankLitGoalBox(renderView, goal, partialTicks, settings.colorGoalBox.value);
+            drawDankLitGoalBox(event.getModelViewStack(), renderView, goal, partialTicks, settings.colorGoalBox.value);
         }
 
         if (!settings.renderPath.value) {
@@ -102,9 +105,9 @@ public final class PathRenderer implements IRenderer, Helper {
         PathExecutor current = behavior.getCurrent(); // this should prevent most race conditions?
         PathExecutor next = behavior.getNext(); // like, now it's not possible for current!=null to be true, then suddenly false because of another thread
         if (current != null && settings.renderSelectionBoxes.value) {
-            drawManySelectionBoxes(renderView, current.toBreak(), settings.colorBlocksToBreak.value);
+            drawManySelectionBoxes(event.getModelViewStack(), renderView, current.toBreak(), settings.colorBlocksToBreak.value);
-            drawManySelectionBoxes(renderView, current.toPlace(), settings.colorBlocksToPlace.value);
+            drawManySelectionBoxes(event.getModelViewStack(), renderView, current.toPlace(), settings.colorBlocksToPlace.value);
-            drawManySelectionBoxes(renderView, current.toWalkInto(), settings.colorBlocksToWalkInto.value);
+            drawManySelectionBoxes(event.getModelViewStack(), renderView, current.toWalkInto(), settings.colorBlocksToWalkInto.value);
         }
 
         //drawManySelectionBoxes(player, Collections.singletonList(behavior.pathStart()), partialTicks, Color.WHITE);
@@ -112,27 +115,27 @@ public final class PathRenderer implements IRenderer, Helper {
         // Render the current path, if there is one
         if (current != null && current.getPath() != null) {
             int renderBegin = Math.max(current.getPosition() - 3, 0);
-            drawPath(current.getPath(), renderBegin, settings.colorCurrentPath.value, settings.fadePath.value, 10, 20);
+            drawPath(event.getModelViewStack(), current.getPath(), renderBegin, settings.colorCurrentPath.value, settings.fadePath.value, 10, 20);
         }
 
         if (next != null && next.getPath() != null) {
-            drawPath(next.getPath(), 0, settings.colorNextPath.value, settings.fadePath.value, 10, 20);
+            drawPath(event.getModelViewStack(), next.getPath(), 0, settings.colorNextPath.value, settings.fadePath.value, 10, 20);
         }
 
         // If there is a path calculation currently running, render the path calculation process
         behavior.getInProgress().ifPresent(currentlyRunning -> {
             currentlyRunning.bestPathSoFar().ifPresent(p -> {
-                drawPath(p, 0, settings.colorBestPathSoFar.value, settings.fadePath.value, 10, 20);
+                drawPath(event.getModelViewStack(), p, 0, settings.colorBestPathSoFar.value, settings.fadePath.value, 10, 20);
             });
 
             currentlyRunning.pathToMostRecentNodeConsidered().ifPresent(mr -> {
-                drawPath(mr, 0, settings.colorMostRecentConsidered.value, settings.fadePath.value, 10, 20);
+                drawPath(event.getModelViewStack(), mr, 0, settings.colorMostRecentConsidered.value, settings.fadePath.value, 10, 20);
-                drawManySelectionBoxes(renderView, Collections.singletonList(mr.getDest()), settings.colorMostRecentConsidered.value);
+                drawManySelectionBoxes(event.getModelViewStack(), renderView, Collections.singletonList(mr.getDest()), settings.colorMostRecentConsidered.value);
             });
         });
     }
 
-    public static void drawPath(IPath path, int startIndex, Color color, boolean fadeOut, int fadeStart0, int fadeEnd0) {
+    public static void drawPath(MatrixStack stack, IPath path, int startIndex, Color color, boolean fadeOut, int fadeStart0, int fadeEnd0) {
         IRenderer.startLines(color, settings.pathRenderLineWidthPixels.value, settings.renderPathIgnoreDepth.value);
 
         int fadeStart = fadeStart0 + startIndex;
@@ -168,7 +171,7 @@ public final class PathRenderer implements IRenderer, Helper {
                 IRenderer.glColor(color, alpha);
             }
 
-            drawLine(start.x, start.y, start.z, end.x, end.y, end.z);
+            drawLine(stack, start.x, start.y, start.z, end.x, end.y, end.z);
 
             tessellator.draw();
         }
@@ -177,24 +180,26 @@ public final class PathRenderer implements IRenderer, Helper {
     }
 
 
-    public static void drawLine(double x1, double y1, double z1, double x2, double y2, double z2) {
+    public static void drawLine(MatrixStack stack, double x1, double y1, double z1, double x2, double y2, double z2) {
+        Matrix4f matrix4f = stack.getLast().getPositionMatrix();
+
         double vpX = posX();
         double vpY = posY();
         double vpZ = posZ();
         boolean renderPathAsFrickinThingy = !settings.renderPathAsLine.value;
 
         buffer.begin(renderPathAsFrickinThingy ? GL_LINE_STRIP : GL_LINES, DefaultVertexFormats.POSITION);
-        buffer.pos(x1 + 0.5D - vpX, y1 + 0.5D - vpY, z1 + 0.5D - vpZ).endVertex();
+        buffer.pos(matrix4f, (float) (x1 + 0.5D - vpX), (float) (y1 + 0.5D - vpY), (float) (z1 + 0.5D - vpZ)).endVertex();
-        buffer.pos(x2 + 0.5D - vpX, y2 + 0.5D - vpY, z2 + 0.5D - vpZ).endVertex();
+        buffer.pos(matrix4f, (float) (x2 + 0.5D - vpX), (float) (y2 + 0.5D - vpY), (float) (z2 + 0.5D - vpZ)).endVertex();
 
         if (renderPathAsFrickinThingy) {
-            buffer.pos(x2 + 0.5D - vpX, y2 + 0.53D - vpY, z2 + 0.5D - vpZ).endVertex();
+            buffer.pos(matrix4f, (float) (x2 + 0.5D - vpX), (float) (y2 + 0.53D - vpY), (float) (z2 + 0.5D - vpZ)).endVertex();
-            buffer.pos(x1 + 0.5D - vpX, y1 + 0.53D - vpY, z1 + 0.5D - vpZ).endVertex();
+            buffer.pos(matrix4f, (float) (x1 + 0.5D - vpX), (float) (y1 + 0.53D - vpY), (float) (z1 + 0.5D - vpZ)).endVertex();
-            buffer.pos(x1 + 0.5D - vpX, y1 + 0.5D - vpY, z1 + 0.5D - vpZ).endVertex();
+            buffer.pos(matrix4f, (float) (x1 + 0.5D - vpX), (float) (y1 + 0.5D - vpY), (float) (z1 + 0.5D - vpZ)).endVertex();
         }
     }
 
-    public static void drawManySelectionBoxes(Entity player, Collection<BlockPos> positions, Color color) {
+    public static void drawManySelectionBoxes(MatrixStack stack, Entity player, Collection<BlockPos> positions, Color color) {
         IRenderer.startLines(color, settings.pathRenderLineWidthPixels.value, settings.renderSelectionBoxesIgnoreDepth.value);
 
         //BlockPos blockpos = movingObjectPositionIn.getBlockPos();
@@ -205,13 +210,13 @@ public final class PathRenderer implements IRenderer, Helper {
             VoxelShape shape = state.getShape(player.world, pos);
             AxisAlignedBB toDraw = shape.isEmpty() ? VoxelShapes.fullCube().getBoundingBox() : shape.getBoundingBox();
             toDraw = toDraw.offset(pos);
-            IRenderer.drawAABB(toDraw, .002D);
+            IRenderer.drawAABB(stack, toDraw, .002D);
         });
 
         IRenderer.endLines(settings.renderSelectionBoxesIgnoreDepth.value);
     }
 
-    public static void drawDankLitGoalBox(Entity player, Goal goal, float partialTicks, Color color) {
+    public static void drawDankLitGoalBox(MatrixStack stack, Entity player, Goal goal, float partialTicks, Color color) {
         double renderPosX = posX();
         double renderPosY = posY();
         double renderPosZ = posZ();
@@ -219,7 +224,7 @@ public final class PathRenderer implements IRenderer, Helper {
         double minZ, maxZ;
         double minY, maxY;
         double y1, y2;
-        double y = 1;
+        double y = MathHelper.cos((float) (((float) ((System.nanoTime() / 100000L) % 20000L)) / 20000F * Math.PI * 2));
         if (goal instanceof IGoalRenderPos) {
             BlockPos goalPos = ((IGoalRenderPos) goal).getGoalPos();
             minX = goalPos.getX() + 0.002 - renderPosX;
@@ -246,27 +251,32 @@ public final class PathRenderer implements IRenderer, Helper {
 
                 Helper.mc.getTextureManager().bindTexture(TEXTURE_BEACON_BEAM);
                 if (settings.renderGoalIgnoreDepth.value) {
-                    GlStateManager.disableDepthTest();
+                    RenderSystem.disableDepthTest();
                 }
 
+                stack.push(); // push
+                stack.translate(goalPos.getX() - renderPosX, -renderPosY, goalPos.getZ() - renderPosZ); // translate
+
                 BeaconTileEntityRenderer.renderBeamSegment(
-                        goalPos.getX() - renderPosX,
+                        stack,
-                        -renderPosY,
+                        mc.getRenderTypeBuffers().getBufferSource(),
-                        goalPos.getZ() - renderPosZ,
+                        TEXTURE_BEACON_BEAM,
                         partialTicks,
-                        1.0,
+                        1.0F,
                         player.world.getGameTime(),
                         0,
                         256,
                         color.getColorComponents(null),
 
                         // Arguments filled by the private method lol
-                        0.2D,
+                        0.2F,
-                        0.25D
+                        0.25F
                 );
 
+                stack.pop(); // pop
+
                 if (settings.renderGoalIgnoreDepth.value) {
-                    GlStateManager.enableDepthTest();
+                    RenderSystem.enableDepthTest();
                 }
 
                 glPopAttrib();
@@ -284,18 +294,18 @@ public final class PathRenderer implements IRenderer, Helper {
             maxY = 256 - renderPosY;
         } else if (goal instanceof GoalComposite) {
             for (Goal g : ((GoalComposite) goal).goals()) {
-                drawDankLitGoalBox(player, g, partialTicks, color);
+                drawDankLitGoalBox(stack, player, g, partialTicks, color);
             }
             return;
         } else if (goal instanceof GoalInverted) {
-            drawDankLitGoalBox(player, ((GoalInverted) goal).origin, partialTicks, settings.colorInvertedGoalBox.value);
+            drawDankLitGoalBox(stack, player, ((GoalInverted) goal).origin, partialTicks, settings.colorInvertedGoalBox.value);
             return;
         } else if (goal instanceof GoalYLevel) {
             GoalYLevel goalpos = (GoalYLevel) goal;
-            minX = player.posX - settings.yLevelBoxSize.value - renderPosX;
+            minX = player.getPositionVec().x - settings.yLevelBoxSize.value - renderPosX;
-            minZ = player.posZ - settings.yLevelBoxSize.value - renderPosZ;
+            minZ = player.getPositionVec().z - settings.yLevelBoxSize.value - renderPosZ;
-            maxX = player.posX + settings.yLevelBoxSize.value - renderPosX;
+            maxX = player.getPositionVec().x + settings.yLevelBoxSize.value - renderPosX;
-            maxZ = player.posZ + settings.yLevelBoxSize.value - renderPosZ;
+            maxZ = player.getPositionVec().z + settings.yLevelBoxSize.value - renderPosZ;
             minY = ((GoalYLevel) goal).level - renderPosY;
             maxY = minY + 2;
             y1 = 1 + y + goalpos.level - renderPosY;
@@ -306,31 +316,32 @@ public final class PathRenderer implements IRenderer, Helper {
 
         IRenderer.startLines(color, settings.goalRenderLineWidthPixels.value, settings.renderGoalIgnoreDepth.value);
 
-        renderHorizontalQuad(minX, maxX, minZ, maxZ, y1);
+        renderHorizontalQuad(stack, minX, maxX, minZ, maxZ, y1);
-        renderHorizontalQuad(minX, maxX, minZ, maxZ, y2);
+        renderHorizontalQuad(stack, minX, maxX, minZ, maxZ, y2);
-
 
+        Matrix4f matrix4f = stack.getLast().getPositionMatrix();
         buffer.begin(GL_LINES, DefaultVertexFormats.POSITION);
-        buffer.pos(minX, minY, minZ).endVertex();
+        buffer.pos(matrix4f, (float) minX, (float) minY, (float) minZ).endVertex();
-        buffer.pos(minX, maxY, minZ).endVertex();
+        buffer.pos(matrix4f, (float) minX, (float) maxY, (float) minZ).endVertex();
-        buffer.pos(maxX, minY, minZ).endVertex();
+        buffer.pos(matrix4f, (float) maxX, (float) minY, (float) minZ).endVertex();
-        buffer.pos(maxX, maxY, minZ).endVertex();
+        buffer.pos(matrix4f, (float) maxX, (float) maxY, (float) minZ).endVertex();
-        buffer.pos(maxX, minY, maxZ).endVertex();
+        buffer.pos(matrix4f, (float) maxX, (float) minY, (float) maxZ).endVertex();
-        buffer.pos(maxX, maxY, maxZ).endVertex();
+        buffer.pos(matrix4f, (float) maxX, (float) maxY, (float) maxZ).endVertex();
-        buffer.pos(minX, minY, maxZ).endVertex();
+        buffer.pos(matrix4f, (float) minX, (float) minY, (float) maxZ).endVertex();
-        buffer.pos(minX, maxY, maxZ).endVertex();
+        buffer.pos(matrix4f, (float) minX, (float) maxY, (float) maxZ).endVertex();
         tessellator.draw();
 
         IRenderer.endLines(settings.renderGoalIgnoreDepth.value);
     }
 
-    private static void renderHorizontalQuad(double minX, double maxX, double minZ, double maxZ, double y) {
+    private static void renderHorizontalQuad(MatrixStack stack, double minX, double maxX, double minZ, double maxZ, double y) {
         if (y != 0) {
+            Matrix4f matrix4f = stack.getLast().getPositionMatrix();
             buffer.begin(GL_LINE_LOOP, DefaultVertexFormats.POSITION);
-            buffer.pos(minX, y, minZ).endVertex();
+            buffer.pos(matrix4f, (float) minX, (float) y, (float) minZ).endVertex();
-            buffer.pos(maxX, y, minZ).endVertex();
+            buffer.pos(matrix4f, (float) maxX, (float) y, (float) minZ).endVertex();
-            buffer.pos(maxX, y, maxZ).endVertex();
+            buffer.pos(matrix4f, (float) maxX, (float) y, (float) maxZ).endVertex();
-            buffer.pos(minX, y, maxZ).endVertex();
+            buffer.pos(matrix4f, (float) minX, (float) y, (float) maxZ).endVertex();
             tessellator.draw();
         }
     }

src/main/java/baritone/utils/PlayerMovementInput.java

@@ -29,7 +29,7 @@ public class PlayerMovementInput extends MovementInput {
     }
 
     @Override
-    public void tick(boolean p_217607_1_, boolean p_217607_2_) {
+    public void func_225607_a_(boolean p_225607_1_) {
         this.moveStrafe = 0.0F;
         this.moveForward = 0.0F;
 
@@ -51,7 +51,7 @@ public class PlayerMovementInput extends MovementInput {
             this.moveStrafe--;
         }
 
-        if (this.sneak = handler.isInputForcedDown(Input.SNEAK)) {
+        if (this.field_228350_h_ = handler.isInputForcedDown(Input.SNEAK)) {
             this.moveStrafe *= 0.3D;
             this.moveForward *= 0.3D;
         }

src/main/java/baritone/utils/accessor/IGuiScreen.java

@@ -21,5 +21,5 @@ import java.net.URI;
 
 public interface IGuiScreen {
 
-    void openLinkInvoker(URI url);
+    void openLink(URI url);
 }

src/main/java/baritone/utils/accessor/IMouse.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.utils.accessor;
-
-/**
- * Duck interface for the mixin that controls mouse operations.
- * <p>
- * Class created by the HyDEV Team on 2020-02-21!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-02-21 13:53
- */
-public interface IMouse
-{
-    void rightClick();
-    void rightHold();
-    void rightRelease();
-
-    void leftClick();
-    void leftHold();
-    void leftRelease();
-}

src/main/java/baritone/utils/accessor/IPalettedContainer.java

@@ -19,7 +19,7 @@ package baritone.utils.accessor;
 
 import net.minecraft.block.BlockState;
 
-public interface IBlockStateContainer {
+public interface IPalettedContainer {
 
     BlockState getAtPalette(int index);
 

src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java

@@ -70,4 +70,4 @@ public final class MCEditSchematic extends StaticSchematic {
             }
         }
     }
-}
+}

src/main/java/org/hydev/hyritone/Hyritone.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 org.hydev.hyritone;
-
-import baritone.Baritone;
-import org.hydev.hyritone.seedxray.SeedServerCache;
-import org.hydev.hyritone.task.TaskManager;
-
-/**
- * TODO: Write a description for this class!
- * <p>
- * Class created by the HyDEV Team on 2020-02-19!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-02-19 13:42
- */
-public class Hyritone
-{
-    public static SeedServerCache seedServerCache;
-    public static TaskManager taskManager;
-
-    public Hyritone(Baritone baritone)
-    {
-        seedServerCache = new SeedServerCache(baritone);
-        taskManager = new TaskManager();
-    }
-}

src/main/java/org/hydev/hyritone/seedxray/SeedServerCache.java

@@ -1,198 +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 org.hydev.hyritone.seedxray;
-
-import baritone.Baritone;
-import baritone.api.event.events.RenderEvent;
-import baritone.api.event.events.TickEvent;
-import baritone.api.utils.BetterBlockPos;
-import baritone.api.utils.Helper;
-import baritone.behavior.Behavior;
-import baritone.utils.PathRenderer;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.util.math.BlockPos;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-
-import java.awt.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static baritone.api.utils.Helper.mc;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.stream.Collectors.toList;
-import static org.hydev.hyritone.utils.MiscUtils.debug;
-import static org.hydev.hyritone.utils.MiscUtils.posId;
-
-/**
- * TODO: Write a description for this class!
- * <p>
- * Class created by the HyDEV Team on 2020-02-19!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-02-19 12:35
- */
-public class SeedServerCache extends Behavior
-{
-    public static CloseableHttpClient http = HttpClients.createDefault();
-
-    public BetterBlockPos cacheLocation;
-    public List<BlockPos> cacheBlocks = new ArrayList<>();
-    public Map<String, BlockState> blocksMap = new HashMap<>();
-
-    public boolean enabled = false;
-    public boolean updating = false;
-
-    // Properties
-    public SeedXrayProperties properties = SeedXrayProperties.DIAMOND;
-    public int max = 64;
-
-    public int ticks = 100;
-
-    public SeedServerCache(Baritone baritone)
-    {
-        super(baritone);
-    }
-
-    /**
-     * Check for updates every tick
-     *
-     * @param event Tick event
-     */
-    @Override
-    public void onTick(TickEvent event)
-    {
-        if (mc.player == null) return;
-        if (updating || !enabled) return;
-
-        // Update cache every 5 seconds (5 * 20 = 100 ticks)
-        ticks ++;
-
-        if (ticks > 100)
-        {
-            ticks = 0;
-            new Thread(this::updateCache).start();
-        }
-    }
-
-    /**
-     * Update cached blocks
-     */
-    public void updateCache()
-    {
-        // Prevent duplicate calls to update
-        updating = true;
-
-        cacheLocation = new BetterBlockPos(mc.player.getPositionVec().x, mc.player.getPositionVec().y + 0.1251, mc.player.getPositionVec().z);
-
-        // Get request
-        HttpGet get = new HttpGet("http://localhost:12255/api/get-locations-of");
-        get.setHeader("world", "world");
-        get.setHeader("block", properties.blockToFind);
-        get.setHeader("maximum", "" + max);
-        get.setHeader("center-x", "" + cacheLocation.getX());
-        get.setHeader("center-y", "" + cacheLocation.getY());
-        get.setHeader("center-z", "" + cacheLocation.getZ());
-        get.setHeader("max-search-rad", "64");
-        get.setHeader("y-min", "" + properties.yMin);
-        get.setHeader("y-max", "" + properties.yMax);
-
-        debug("==============================================");
-        debug("Getting block data from seed exploit server...");
-
-        try (CloseableHttpResponse response = http.execute(get))
-        {
-            // Exited
-            if (mc.world == null) return;
-
-            ArrayList<BlockPos> blocks = new ArrayList<>();
-            JsonArray array = new JsonParser().parse(IOUtils.toString(response.getEntity().getContent(), UTF_8)).getAsJsonArray();
-            array.forEach(j ->
-            {
-                JsonObject obj = j.getAsJsonObject();
-                blocks.add(new BlockPos(obj.get("x").getAsInt(), obj.get("y").getAsInt(), obj.get("z").getAsInt()));
-            });
-
-            // Only add it if it is not air in the client world
-            cacheBlocks = blocks.stream().filter(b -> !mc.world.getBlockState(b).isAir()).collect(toList());
-
-            // Update blocks map
-            Map<String, BlockState> map = new HashMap<>();
-            cacheBlocks.forEach(b -> map.put(posId(b), Blocks.DIAMOND_ORE.getDefaultState()));
-            blocksMap = map;
-
-            debug("Found " + cacheBlocks.size() + " valid ores.");
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-
-        updating = false;
-    }
-
-    @Override
-    public void onRenderPass(RenderEvent event)
-    {
-        if (!enabled) return;
-
-        // Render xray
-        PathRenderer.drawManySelectionBoxes(Helper.mc.getRenderViewEntity(), cacheBlocks, Color.cyan);
-    }
-
-    @Override
-    public void onBlockBreak(BlockPos pos)
-    {
-        // Remove block from list
-        if (!cacheBlocks.removeIf(b -> posId(b).equals(posId(pos)))) return;
-
-        // Remove block from map
-        blocksMap.remove(posId(pos));
-
-        // Remove block from server
-        HttpGet get = new HttpGet("http://localhost:12255/api/remove-block");
-        get.setHeader("world", "world");
-        get.setHeader("x", "" + pos.getX());
-        get.setHeader("y", "" + pos.getY());
-        get.setHeader("z", "" + pos.getZ());
-
-        new Thread(() ->
-        {
-            try (CloseableHttpResponse response = http.execute(get))
-            {
-                System.out.println(IOUtils.toString(response.getEntity().getContent(), UTF_8));
-            }
-            catch (IOException e)
-            {
-                e.printStackTrace();
-            }
-        }).start();
-    }
-}

src/main/java/org/hydev/hyritone/seedxray/SeedXrayCommand.java

@@ -1,107 +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 org.hydev.hyritone.seedxray;
-
-import baritone.Baritone;
-import baritone.api.IBaritone;
-import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.stream.Stream;
-
-import static org.hydev.hyritone.Hyritone.seedServerCache;
-import static org.hydev.hyritone.utils.MiscUtils.print;
-
-/**
- * TODO: Write a description for this class!
- * <p>
- * Class created by the HyDEV Team on 2020-02-19!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-02-19 12:29
- */
-public class SeedXrayCommand extends Command
-{
-    public SeedXrayCommand(IBaritone baritone) {
-        super(baritone, "seedxray");
-    }
-
-    @Override
-    public void execute(String label, IArgConsumer args) throws CommandException
-    {
-        if (Baritone.settings().mineWithSeed.value = seedServerCache.enabled = !seedServerCache.enabled)
-        {
-            // Set args
-            args.requireMin(1);
-            args.requireMax(2);
-
-            // Ore
-            if (!args.hasAny()) return;
-            String ore = args.getString();
-            SeedXrayProperties properties = SeedXrayProperties.byName(ore);
-            seedServerCache.properties = properties;
-
-            // Max
-            if (args.hasAny())
-            {
-                seedServerCache.max = args.getAs(Integer.class);
-            }
-
-            print("Seed xray enabled");
-        }
-        else
-        {
-            // Reset status
-            seedServerCache.ticks = 100;
-            seedServerCache.blocksMap = new HashMap<>();
-            seedServerCache.cacheLocation = null;
-            seedServerCache.cacheBlocks = new ArrayList<>();
-            seedServerCache.updating = false;
-            seedServerCache.max = 64;
-
-            print("Seed xray disabled");
-        }
-    }
-
-    @Override
-    public Stream<String> tabComplete(String label, IArgConsumer args) {
-        return Stream.empty();
-    }
-
-    @Override
-    public String getShortDesc() {
-        return "Hyritone: Find ores from the seed server";
-    }
-
-    @Override
-    public List<String> getLongDesc() {
-        return Arrays.asList(
-            "This function draws ESP boxes around the ores that exists in the seed server that are not mined.",
-            "",
-            "Usage:",
-            "> seedxray <ore preset> (max)"
-        );
-    }
-}

src/main/java/org/hydev/hyritone/seedxray/SeedXrayProperties.java

@@ -1,62 +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 org.hydev.hyritone.seedxray;
-
-import lombok.AllArgsConstructor;
-
-/**
- * TODO: Write a description for this class!
- * <p>
- * Class created by the HyDEV Team on 2020-02-23!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-02-23 11:32
- */
-@AllArgsConstructor
-public enum SeedXrayProperties
-{
-    DIAMOND("diamond", "diamond_ore", 3, 16),
-    IRON("iron", "iron_ore", 20, 60),
-    REDSTONE("redstone", "redstone_ore", 3, 16),
-    LAPIS("lapis", "lapis_lazuri_ore", 5, 30),
-    GOLD("gold", "gold_ore", 5, 30),
-    GOLD_BADLANDS("gold_badlands", "gold_ore", 32, 70),
-    EMERALD("emerald", "emerald_ore", 5, 30);
-
-    public String name;
-    public String blockToFind;
-    public int yMin;
-    public int yMax;
-
-    public static SeedXrayProperties byName(String name)
-    {
-        name = name.toLowerCase().replace("-", "_");
-
-        for (SeedXrayProperties value : SeedXrayProperties.values())
-        {
-            if (value.name.equals(name) || value.blockToFind.equals(name))
-            {
-                return value;
-            }
-        }
-
-        return null;
-    }
-}

src/main/java/org/hydev/hyritone/task/Task.java

@@ -1,27 +0,0 @@
-package org.hydev.hyritone.task;
-
-/**
- * A task waiting to be executed.
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 18:06
- */
-public interface Task
-{
-    /**
-     * Execute the task
-     */
-    void execute(TaskRunState state);
-
-    /**
-     * Stop the task
-     */
-    default void stop()
-    {
-        // Default nothing to do
-    }
-}

src/main/java/org/hydev/hyritone/task/TaskCommand.java

@@ -1,82 +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 org.hydev.hyritone.task;
-
-import baritone.api.IBaritone;
-import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import org.hydev.hyritone.Hyritone;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- * TODO: Write a description for this class!
- * <p>
- * Class created by the HyDEV Team on 2020-02-21!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-02-21 19:47
- */
-public class TaskCommand extends Command
-{
-    /**
-     * Creates a new Baritone control command.
-     *
-     * @param baritone
-     * @param names The names of this command. This is what you put after the command prefix.
-     */
-    public TaskCommand(IBaritone baritone, String... names)
-    {
-        super(baritone, "task");
-    }
-
-    @Override
-    public void execute(String label, IArgConsumer args) throws CommandException
-    {
-        if (Hyritone.taskManager.getRunState() != null) Hyritone.taskManager.stop();
-        else Hyritone.taskManager.run(TaskPresets.presets.get("AutoEmeralds"));
-    }
-
-    @Override
-    public Stream<String> tabComplete(String label, IArgConsumer args) throws CommandException
-    {
-        return Stream.empty();
-    }
-
-    @Override
-    public String getShortDesc()
-    {
-        return "Manage tasks";
-    }
-
-    @Override
-    public List<String> getLongDesc()
-    {
-        return Arrays.asList(
-            "Manage tasks.",
-            "",
-            "Usage:",
-            "> task "
-        );
-    }
-}

src/main/java/org/hydev/hyritone/task/TaskList.java

@@ -1,28 +0,0 @@
-package org.hydev.hyritone.task;
-
-import lombok.AllArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-/**
- * Instances of this class contains lists of tasks to be executed in order.
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 18:05
- */
-@AllArgsConstructor
-public class TaskList extends ArrayList<Task>
-{
-    public final String name;
-
-    public TaskList(String name, Task... tasks)
-    {
-        this(name);
-        Collections.addAll(this, tasks);
-    }
-}

src/main/java/org/hydev/hyritone/task/TaskManager.java

@@ -1,96 +0,0 @@
-package org.hydev.hyritone.task;
-
-import lombok.Getter;
-
-import static org.hydev.hyritone.utils.MiscUtils.debug;
-
-/**
- * This class is used to manage tasks.
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 19:03
- */
-@Getter
-public class TaskManager
-{
-    private TaskRunState runState = null;
-
-    /**
-     * Run a task list
-     *
-     * @param list Task list
-     * @return Successfully started or not
-     */
-    public boolean run(TaskList list)
-    {
-        // Check already started
-        if (runState != null)
-        {
-            stop();
-        }
-
-        // Reset values
-        runState = new TaskRunState(null, list, 0);
-
-       /* // Execute task
-        Baritone.getExecutor().execute(() ->
-        {
-            // Execute step by step
-            while (runState.step < list.size())
-            {
-                list.get(runState.step).execute(runState);
-                runState.step++;
-            }
-
-            // Finished
-            stop();
-        });*/
-
-        // Create thread
-        runState.thread = new Thread(() ->
-        {
-            // Execute step by step
-            while (runState.step < list.size())
-            {
-                debug("Running step " + runState);
-                list.get(runState.step).execute(runState);
-                runState.step++;
-            }
-
-            // Finished
-            stop();
-        }, "Hyritone Task");
-
-        // Start async
-        runState.thread.start();
-
-        // Success
-        return true;
-    }
-
-    /**
-     * Stop the task list
-     */
-    public void stop()
-    {
-        // Not started
-        if (runState == null) return;
-
-        // Stop thread
-        runState.thread.interrupt();
-
-        // Stop task
-        if (runState.getStep() < runState.getTaskList().size())
-        {
-            runState.getTaskList().get(runState.getStep()).stop();
-        }
-
-        runState = null;
-    }
-
-    // TODO: pause
-}

src/main/java/org/hydev/hyritone/task/TaskPresets.java

@@ -1,95 +0,0 @@
-package org.hydev.hyritone.task;
-
-import com.google.gson.Gson;
-import lombok.SneakyThrows;
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileVisitOption;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
-
-import static baritone.api.utils.Helper.mc;
-
-/**
- * This class contains preset tasks
- * TODO: Make a UI for task list!
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 18:23
- */
-public class TaskPresets
-{
-    // Map<name.toLowerCase(), taskList>
-    public static Map<String, TaskList> presets = new HashMap<>();
-
-    /**
-     * Register a task list
-     *
-     * @param list Task list
-     */
-    public static void register(TaskList list)
-    {
-        presets.put(list.name.toLowerCase(), list);
-    }
-
-    /**
-     * Get preset by name
-     *
-     * @param name Lowercase name
-     * @return Task list by name, null if not found
-     */
-    public static TaskList getPreset(String name)
-    {
-        if (presets.containsKey(name.toLowerCase()))
-        {
-            return presets.get(name.toLowerCase());
-        }
-        return null;
-    }
-
-    /**
-     * Load presets from file
-     */
-    @SneakyThrows
-    public static void reloadPresets()
-    {
-        Path filePath = new File(mc.gameDir, "./Hyritone/").toPath();
-        Files.createDirectories(filePath);
-
-        presets.clear();
-
-        try
-        {
-            Files.walk(filePath, FileVisitOption.FOLLOW_LINKS)
-                .filter(Files::isRegularFile)
-                .forEach(path ->
-                {
-                    try
-                    {
-                        String json = FileUtils.readFileToString(path.toFile(), StandardCharsets.UTF_8);
-                        TaskList list = new Gson().fromJson(json, TaskList.class);
-                        presets.put(list.name.toLowerCase(), list);
-                    }
-                    catch (IOException e)
-                    {
-                        throw new UncheckedIOException(e);
-                    }
-                });
-        }
-        catch (IOException | UncheckedIOException e)
-        {
-            System.err.println("Error when loading org.hydev.hyritone json.");
-            e.printStackTrace();
-        }
-    }
-}

src/main/java/org/hydev/hyritone/task/TaskRunState.java

@@ -1,30 +0,0 @@
-package org.hydev.hyritone.task;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * TODO: Write a description for this class!
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 20:38
- */
-@Data
-@AllArgsConstructor
-public class TaskRunState
-{
-    public Thread thread;
-    public TaskList taskList;
-    public int step;
-
-    @Override
-    public String toString()
-    {
-        return "Task " + thread.getId() + " is executing step " + step + " of " + taskList.size() + " " +
-            "| Current Task: " + taskList.get(step).getClass().getSimpleName();
-    }
-}

src/main/java/org/hydev/hyritone/task/TaskTestCommand.java

@@ -1,174 +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 org.hydev.hyritone.task;
-
-import baritone.api.IBaritone;
-import baritone.api.command.Command;
-import baritone.api.command.argument.IArgConsumer;
-import baritone.api.command.exception.CommandException;
-import baritone.api.utils.Rotation;
-import net.minecraft.inventory.container.ChestContainer;
-import net.minecraft.inventory.container.MerchantContainer;
-import org.hydev.hyritone.task.defaults.*;
-import org.hydev.hyritone.utils.PlayerUtils;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.stream.Stream;
-
-import static java.lang.Long.MAX_VALUE;
-import static net.minecraft.inventory.container.ClickType.*;
-import static net.minecraft.item.Items.BOOK;
-import static net.minecraft.item.Items.BOOKSHELF;
-import static org.hydev.hyritone.utils.PlayerUtils.*;
-
-/**
- * TODO: Write a description for this class!
- * <p>
- * Class created by the HyDEV Team on 2020-02-21!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-02-21 19:48
- */
-public class TaskTestCommand extends Command
-{
-    /**
-     * Creates a new Baritone control command.
-     *
-     * @param baritone
-     * @param names The names of this command. This is what you put after the command prefix.
-     */
-    public TaskTestCommand(IBaritone baritone, String... names)
-    {
-        super(baritone, "tasktest");
-    }
-
-    @Override
-    public void execute(String label, IArgConsumer args) throws CommandException
-    {
-        TaskList test = new TaskList("AutoEmeralds",
-            // 等待时间在 2000 (8:00) 和 9000 (15:00) 之间w
-            new TaskWaitFor(s -> ticks() > 2000 && ticks() < 9000).timeout(MAX_VALUE),
-
-            // 转向村民
-            s -> PlayerUtils.rotate(new Rotation(-90, 0)), // 转向村民w
-            new TaskDelay(10), // 等w
-
-            // 打开村民交易w
-            s -> mouse().rightClick(), // 点击村民w
-            new TaskWaitFor(s -> player().openContainer instanceof MerchantContainer) // 等点击完成w
-                .onTimeout(new TaskReplayRelative(1)), // 如果失败就重来w
-
-            // 和村民交易w (绿宝石 -> 书架)
-            s -> controller().windowClick(containerId(), 36, 0, PICKUP, player()), // 拿起绿宝石w
-            new TaskDelay(1000), // 等w
-            s -> controller().windowClick(containerId(), 0, 0, PICKUP, player()), // 把书放到交易框w
-            new TaskDelay(1000), // 等w
-            s -> controller().windowClick(containerId(), 2, 0, QUICK_MOVE, player()), // 把书架移到 8
-            new TaskDelay(1000), // 等w
-            s -> player().closeScreen(), // 关掉界面w
-
-            // 把书架转换回书w
-            s -> PlayerUtils.rotate(new Rotation(90, 0)), // 转到后面面向黑曜石w
-            s -> player().inventory.currentItem = 8, // 选择 1: 书架w
-            s -> mouse().rightClick(), // 放书架w
-            new TaskDelay(1000), // 等w
-            s -> player().inventory.currentItem = 0, // 选择 0: 斧子w
-            s -> PlayerUtils.dig(getLookingAtBlock()), // 挖掉w
-            new TaskDelay(1000), // 等w
-            new TaskCondition(s -> !player().inventory.hasAny(new HashSet<>(Collections.singletonList(BOOKSHELF))))
-                .taskElse(new TaskReplayRelative(5 + 2)), // 如果没有书架了就继续, 有的话就回到 5 步之前w
-
-            // 转向村民
-            s -> PlayerUtils.rotate(new Rotation(-90, 0)), // 转向村民w
-            new TaskDelay(10), // 等w
-
-            // 打开村民交易w
-            s -> mouse().rightClick(), // 点击村民w
-            new TaskWaitFor(s -> player().openContainer instanceof MerchantContainer) // 等点击完成w
-                .onTimeout(new TaskReplayRelative(1)), // 如果失败就重来w
-
-            // 和村民交易w (书 -> 绿宝石)
-            s -> controller().windowClick(containerId(), 31, 0, PICKUP, player()), // 拿起书
-            s -> controller().windowClick(containerId(), 0, 0, PICKUP, player()), // 把书放到交易框w
-            new TaskDelay(1000), // 等w
-            s -> controller().windowClick(containerId(), 2, 0, QUICK_MOVE, player()), // 把绿宝石移到 8
-            new TaskDelay(1000), // 等w
-            s -> controller().windowClick(containerId(), 0, 0, PICKUP, player()), // 拿起剩下的书
-            s -> controller().windowClick(containerId(), 31, 0, PICKUP, player()), // 在 1 放下书
-            new TaskDelay(1000), // 等w
-            s -> player().closeScreen(), // 关掉界面w
-            new TaskDelay(5000), // 等村民补充w
-            new TaskCondition(s -> player().inventory.hasAny(new HashSet<>(Collections.singletonList(BOOK))))
-                .taskElse(new TaskReplayRelative(9 + 3)), // 如果没有书了就继续, 有的话就回到 10 步之前w
-
-            // 转向箱子w
-            s -> PlayerUtils.rotate(new Rotation(180, 0)), // 转向箱子w
-            new TaskDelay(10), // 等w
-
-            // 打开箱子w
-            s -> mouse().rightClick(), // 点击箱子w
-            new TaskWaitFor(s -> player().openContainer instanceof ChestContainer) // 等点击完成w
-                .onTimeout(new TaskReplayRelative(1)), // 如果失败就重来w
-
-            // 把多余的绿宝石放到箱子里w
-            s -> controller().windowClick(containerId(), 89, 0, PICKUP, player()), // 拿起 36 个绿宝石w
-            s -> controller().windowClick(containerId(), -999, 0, QUICK_CRAFT, player()), // 开始快速合成w
-            s -> controller().windowClick(containerId(), 89, 1, QUICK_CRAFT, player()), // 在 8 放 1/3
-            s -> controller().windowClick(containerId(), 88, 1, QUICK_CRAFT, player()), // 在 7 放 1/3
-            s -> controller().windowClick(containerId(), 87, 1, QUICK_CRAFT, player()), // 在 6 放 1/3
-            s -> controller().windowClick(containerId(), -999, 2, QUICK_CRAFT, player()), // 结束快速合成w
-            s -> controller().windowClick(containerId(), 88, 0, QUICK_MOVE, player()), // 把 7 的绿宝石移到箱子里w
-            s -> controller().windowClick(containerId(), 89, 0, QUICK_MOVE, player()), // 把 8 的绿宝石移到箱子里w
-            s -> player().closeScreen(), // 关闭箱子w
-
-            // 从头开始w
-            new TaskReplay(0)
-        );
-
-        TaskPresets.presets.clear();
-        TaskPresets.presets.put("AutoEmeralds", test);
-    }
-
-    @Override
-    public Stream<String> tabComplete(String label, IArgConsumer args) throws CommandException
-    {
-        return Stream.empty();
-    }
-
-    @Override
-    public String getShortDesc()
-    {
-        return "Add testing task";
-    }
-
-    @Override
-    public List<String> getLongDesc()
-    {
-        return Arrays.asList(
-            "Add testing task.",
-            "",
-            "Usage:",
-            "> tasktest "
-        );
-    }
-}

src/main/java/org/hydev/hyritone/task/defaults/TaskCondition.java

@@ -1,47 +0,0 @@
-package org.hydev.hyritone.task.defaults;
-
-import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import org.hydev.hyritone.task.Task;
-import org.hydev.hyritone.task.TaskRunState;
-
-import java.util.function.Function;
-
-/**
- * Run task if condition is met
- * <p>
- * Class created by the HyDEV Team on 2020-01-25!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * o@since 2020-01-25 17:44
- */
-@Setter
-@Accessors(fluent = true)
-@AllArgsConstructor
-@RequiredArgsConstructor
-public class TaskCondition implements Task
-{
-    private final Function<TaskRunState, Boolean> condition;
-    private Task taskThen;
-    private Task taskElse;
-
-    @Override
-    public void execute(TaskRunState state)
-    {
-        if (condition.apply(state))
-        {
-            if (taskThen != null)
-            {
-                taskThen.execute(state);
-            }
-        }
-        else if (taskElse != null)
-        {
-            taskElse.execute(state);
-        }
-    }
-}

src/main/java/org/hydev/hyritone/task/defaults/TaskDelay.java

@@ -1,31 +0,0 @@
-package org.hydev.hyritone.task.defaults;
-
-import lombok.AllArgsConstructor;
-import org.hydev.hyritone.task.Task;
-import org.hydev.hyritone.task.TaskRunState;
-
-/**
- * Task to delay for some seconds
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 18:21
- */
-@AllArgsConstructor
-public class TaskDelay implements Task
-{
-    private final long delay;
-
-    @Override
-    public void execute(TaskRunState state)
-    {
-        try
-        {
-            Thread.sleep(delay);
-        }
-        catch (InterruptedException ignored) {}
-    }
-}

src/main/java/org/hydev/hyritone/task/defaults/TaskInteract.java

@@ -1,31 +0,0 @@
-package org.hydev.hyritone.task.defaults;
-
-import lombok.AllArgsConstructor;
-import net.minecraft.util.math.BlockPos;
-import org.hydev.hyritone.task.Task;
-import org.hydev.hyritone.task.TaskRunState;
-import org.hydev.hyritone.utils.PlayerUtils;
-
-/**
- * Interact with blocks (Eg. chests)
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 23:10
- */
-@AllArgsConstructor
-public class TaskInteract implements Task
-{
-    private final long x;
-    private final long y;
-    private final long z;
-
-    @Override
-    public void execute(TaskRunState state)
-    {
-        PlayerUtils.interact(new BlockPos(x, y, z));
-    }
-}

src/main/java/org/hydev/hyritone/task/defaults/TaskReplay.java

@@ -1,27 +0,0 @@
-package org.hydev.hyritone.task.defaults;
-
-import lombok.AllArgsConstructor;
-import org.hydev.hyritone.task.Task;
-import org.hydev.hyritone.task.TaskRunState;
-
-/**
- * Replay from some index
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 20:37
- */
-@AllArgsConstructor
-public class TaskReplay implements Task
-{
-    private final int step;
-
-    @Override
-    public void execute(TaskRunState state)
-    {
-        state.step = step - 1;
-    }
-}

src/main/java/org/hydev/hyritone/task/defaults/TaskReplayRelative.java

@@ -1,27 +0,0 @@
-package org.hydev.hyritone.task.defaults;
-
-import lombok.AllArgsConstructor;
-import org.hydev.hyritone.task.Task;
-import org.hydev.hyritone.task.TaskRunState;
-
-/**
- * Replay from some index
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 20:37
- */
-@AllArgsConstructor
-public class TaskReplayRelative implements Task
-{
-    private final int stepOffset;
-
-    @Override
-    public void execute(TaskRunState state)
-    {
-        state.step -= stepOffset + 1;
-    }
-}

src/main/java/org/hydev/hyritone/task/defaults/TaskWaitFor.java

@@ -1,58 +0,0 @@
-package org.hydev.hyritone.task.defaults;
-
-import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-import org.hydev.hyritone.task.Task;
-import org.hydev.hyritone.task.TaskRunState;
-
-import java.util.function.Function;
-
-import static org.hydev.hyritone.utils.MiscUtils.sleep;
-
-/**
- * Wait for a condition to complete
- * <p>
- * Class created by the HyDEV Team on 2020-01-25!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-25 12:29
- */
-@Accessors(fluent = true)
-@Setter
-@AllArgsConstructor
-@RequiredArgsConstructor
-public class TaskWaitFor implements Task
-{
-    private final Function<TaskRunState, Boolean> condition;
-    private Task onTimeout;
-    private long timeout = 10 * 60 * 1000;
-    private long interval = 100;
-
-    @Override
-    public void execute(TaskRunState state)
-    {
-        // Timeout detection
-        long startTime = System.currentTimeMillis();
-
-        // Run
-        while (true)
-        {
-            if (condition.apply(state)) return;
-            sleep(interval);
-
-            if (System.currentTimeMillis() - startTime > timeout)
-            {
-                // Timeout callback
-                if (onTimeout != null)
-                {
-                    onTimeout.execute(state);
-                }
-                return;
-            }
-        }
-    }
-}

src/main/java/org/hydev/hyritone/utils/MiscUtils.java

@@ -1,77 +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 org.hydev.hyritone.utils;
-
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.StringTextComponent;
-
-import static baritone.api.utils.Helper.mc;
-
-/**
- * TODO: Write a description for this class!
- * <p>
- * Class created by the HyDEV Team on 2020-02-19!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-02-19 13:28
- */
-public class MiscUtils
-{
-    public static void print(String text)
-    {
-        if (mc.player == null) return;
-
-        mc.player.sendMessage(new StringTextComponent("§3§l[§bHyritone§3§l] §r" + text));
-        System.out.println("Log: " + text);
-    }
-
-    public static void debug(String text)
-    {
-        print("§8[§7Debug§8]§7 " + text);
-    }
-
-    /**
-     * Get an identifier for a block pos that's unique for each xyz
-     *
-     * @param pos Block position
-     * @return Stringify
-     */
-    public static String posId(BlockPos pos)
-    {
-        return String.format("[%s,%s,%s]", pos.getX(), pos.getY(), pos.getZ());
-    }
-
-    /**
-     * Sleep without exceptions
-     *
-     * @param ms Time in ms
-     */
-    public static void sleep(long ms)
-    {
-        try
-        {
-            Thread.sleep(ms);
-        }
-        catch (InterruptedException e)
-        {
-            e.printStackTrace();
-        }
-    }
-}

src/main/java/org/hydev/hyritone/utils/PlayerUtils.java

@@ -1,230 +0,0 @@
-package org.hydev.hyritone.utils;
-
-import baritone.api.utils.Rotation;
-import baritone.utils.accessor.IMouse;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.multiplayer.PlayerController;
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.network.play.client.CAnimateHandPacket;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
-import net.minecraft.util.math.*;
-
-import static baritone.api.utils.Helper.mc;
-import static net.minecraft.util.math.RayTraceContext.BlockMode.OUTLINE;
-import static net.minecraft.util.math.RayTraceContext.FluidMode.NONE;
-import static net.minecraft.util.math.RayTraceResult.Type.BLOCK;
-
-/**
- * Utils for controlling the player.
- * <p>
- * Class created by the HyDEV Team on 2020-01-24!
- *
- * @author HyDEV Team (https://github.com/HyDevelop)
- * @author Hykilpikonna (https://github.com/hykilpikonna)
- * @author Vanilla (https://github.com/VergeDX)
- * @since 2020-01-24 22:34
- */
-public class PlayerUtils
-{
-    public static ClientPlayerEntity player() { return mc.player; }
-    public static ClientWorld world() { return mc.world; }
-    public static IMouse mouse() { return (IMouse) mc.mouseHelper; }
-    public static PlayerController controller() { return mc.playerController; }
-    public static int containerId() { return player().openContainer.windowId; }
-
-    /**
-     * Get player's eye vector
-     *
-     * @return Eye vector
-     * @author Wurst7 https://github.com/Wurst-Imperium/Wurst7
-     */
-    public static Vec3d getEyesPos()
-    {
-        assert player() != null;
-
-        return new Vec3d(player().getPositionVec().x,
-            player().getPositionVec().y + player().getEyeHeight(player().getPose()),
-            player().getPositionVec().z);
-    }
-
-    /**
-     * Get what does it take to rotate to a direction
-     *
-     * @param vec Final direction
-     * @return Rotation required
-     * @author Wurst7 https://github.com/Wurst-Imperium/Wurst7
-     */
-    public static Rotation getNeededRotations(Vec3d vec)
-    {
-        Vec3d eyesPos = getEyesPos();
-
-        double diffX = vec.x - eyesPos.x;
-        double diffY = vec.y - eyesPos.y;
-        double diffZ = vec.z - eyesPos.z;
-
-        double diffXZ = Math.sqrt(diffX * diffX + diffZ * diffZ);
-
-        float yaw = (float)Math.toDegrees(Math.atan2(diffZ, diffX)) - 90F;
-        float pitch = (float)-Math.toDegrees(Math.atan2(diffY, diffXZ));
-
-        return new Rotation(yaw, pitch);
-    }
-
-    /**
-     * Rotate
-     *
-     * @param rotation Relative rotation
-     */
-    public static void rotate(Rotation rotation)
-    {
-        player().rotationYaw = rotation.getYaw();
-        player().rotationPitch = rotation.getPitch();
-    }
-
-    /**
-     * Rotate to face one block
-     *
-     * @param pos Block position
-     * @return Direction
-     * @author Wurst7 https://github.com/Wurst-Imperium/Wurst7
-     */
-    public static Direction rotateToBlock(BlockPos pos)
-    {
-        Direction side = null;
-        Direction[] sides = Direction.values();
-
-        Vec3d eyesPos = getEyesPos();
-        Vec3d relCenter = world().getBlockState(pos).getShape(world(), pos).getBoundingBox().getCenter();
-        Vec3d center = new Vec3d(pos).add(relCenter);
-
-        Vec3d[] hitVecs = new Vec3d[sides.length];
-        for (int i = 0; i < sides.length; i++)
-        {
-            Vec3i dirVec = sides[i].getDirectionVec();
-            Vec3d relHitVec = new Vec3d(relCenter.x * dirVec.getX(),
-                relCenter.y * dirVec.getY(), relCenter.z * dirVec.getZ());
-            hitVecs[i] = center.add(relHitVec);
-        }
-
-        BlockState state = world().getBlockState(pos);
-        for (int i = 0; i < sides.length; i++)
-        {
-            // check line of sight TODO
-            /*if (world().rayTraceBlocks(new RayTraceContext(eyesPos, hitVecs[i], pos, state.getShape(world(), pos), state)) != null)
-            {
-                continue;
-            }*/
-
-            side = sides[i];
-            break;
-        }
-
-        if (side == null)
-        {
-            double distanceSqToCenter = eyesPos.squareDistanceTo(center);
-            for (int i = 0; i < sides.length; i++)
-            {
-                // check if side is facing towards player
-                if (eyesPos.squareDistanceTo(hitVecs[i]) >= distanceSqToCenter)
-                {
-                    continue;
-                }
-
-                side = sides[i];
-                break;
-            }
-        }
-
-        // player is inside of block, side doesn't matter
-        if (side == null)
-        {
-            side = sides[0];
-        }
-
-        // Rotate
-        rotate(getNeededRotations(hitVecs[side.ordinal()]));
-
-        return side;
-    }
-
-    public static BlockPos getLookingAtBlock()
-    {
-        Vec3d cameraPos = player().getEyePosition(1);
-        Vec3d rotation = player().getLook(1);
-        Vec3d combined = cameraPos.add(rotation.x * 5, rotation.y * 5, rotation.z * 5);
-
-        BlockRayTraceResult result = mc.world.rayTraceBlocks(new RayTraceContext(cameraPos, combined, OUTLINE, NONE, player()));
-
-        if (result.getType() == BLOCK)
-        {
-            return result.getPos();
-        }
-        else return null;
-    }
-
-    /**
-     * Interact
-     *
-     * @param pos Block
-     */
-    public static void interact(BlockPos pos)
-    {
-        rotateToBlock(pos);
-        mouse().rightClick();
-    }
-
-    /**
-     * Dig the block at direction
-     *
-     * @param pos Block position
-     * @param side Direction
-     * @return Dig success or not
-     * @author Wurst7 https://github.com/Wurst-Imperium/Wurst7
-     */
-    public static boolean dig(BlockPos pos, Direction side)
-    {
-        // damage block
-        if (!controller().onPlayerDamageBlock(pos, side))
-        {
-            return false;
-        }
-
-        // swing arm
-        player().connection.sendPacket(new CAnimateHandPacket(Hand.MAIN_HAND));
-
-        return true;
-    }
-
-    /**
-     * Dig the block at direction
-     *
-     * @param pos Block position
-     * @return Dig success or not
-     */
-    public static boolean dig(BlockPos pos)
-    {
-        return dig(pos, rotateToBlock(pos));
-    }
-
-    /**
-     * Delay between swapping items from inv to chest.
-     *
-     * @return Delay between 80 to 120
-     */
-    public static int chestDelay()
-    {
-        return (int) (80 + Math.random() * 40);
-    }
-
-    /**
-     * Return ticks of day
-     *
-     * @return Ticks of day
-     */
-    public static long ticks()
-    {
-        return world().getDayTime() % 24000;
-    }
-}