merge

src/main/java/baritone/chunk/CachedWorld.java

@@ -36,7 +36,7 @@ public final class CachedWorld implements IBlockTypeAccess {
     /**
      * The maximum number of regions in any direction from (0,0)
      */
-    private static final int REGION_MAX = 117188;
+    private static final int REGION_MAX = 58594;
 
     /**
      * A map of all of the cached regions.

src/main/java/baritone/launch/mixins/MixinEntity.java

@@ -20,7 +20,7 @@ package baritone.launch.mixins;
 import baritone.Baritone;
 import baritone.event.events.RelativeMoveEvent;
 import baritone.event.events.type.EventState;
-import baritone.utils.Helper;
+import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -40,7 +40,7 @@ public class MixinEntity {
     )
     private void preMoveRelative(float strafe, float up, float forward, float friction, CallbackInfo ci) {
         Entity _this = (Entity) (Object) this;
-        if (_this == Helper.mc.player)
+        if (_this == Minecraft.getMinecraft().player)
             Baritone.INSTANCE.getGameEventHandler().onPlayerRelativeMove(new RelativeMoveEvent(EventState.PRE));
     }
 
@@ -50,7 +50,7 @@ public class MixinEntity {
     )
     private void postMoveRelative(float strafe, float up, float forward, float friction, CallbackInfo ci) {
         Entity _this = (Entity) (Object) this;
-        if (_this == Helper.mc.player)
+        if (_this == Minecraft.getMinecraft().player)
             Baritone.INSTANCE.getGameEventHandler().onPlayerRelativeMove(new RelativeMoveEvent(EventState.POST));
     }
 }

src/main/java/baritone/utils/ExampleBaritoneControl.java

@@ -22,6 +22,7 @@ import baritone.Settings;
 import baritone.behavior.Behavior;
 import baritone.behavior.impl.PathingBehavior;
 import baritone.event.events.ChatEvent;
+import baritone.map.Map;
 import baritone.pathing.calc.AStarPathFinder;
 import baritone.pathing.goals.Goal;
 import baritone.pathing.goals.GoalBlock;
@@ -31,7 +32,6 @@ import baritone.pathing.movement.ActionCosts;
 import baritone.pathing.movement.CalculationContext;
 import baritone.pathing.movement.Movement;
 import baritone.utils.pathing.BetterBlockPos;
-import baritone.map.Map;
 import net.minecraft.util.math.BlockPos;
 
 import java.util.ArrayList;
@@ -181,7 +181,7 @@ public class ExampleBaritoneControl extends Behavior {
                 }
             }
         }
-        if(msg.toLowerCase().equals("map")) {
+        if (msg.toLowerCase().equals("map")) {
             Map.INSTANCE.writeImage();
         }
         if (Baritone.settings().byLowerName.containsKey(msg.toLowerCase())) {