azalea/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Leijurv
2018-08-22 14:55:44 -07:00
parent d16d5ba0e2 d9a00ce164
commit 61b61ea07b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/baritone/chunk/CachedWorld.java
+1 -1
View File
@@ -36,7 +36,7 @@ public final class CachedWorld implements IBlockTypeAccess {
/** /**
* The maximum number of regions in any direction from (0,0) * 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. * A map of all of the cached regions.
src/main/java/baritone/launch/mixins/MixinEntity.java
+3 -3
View File
@@ -20,7 +20,7 @@ package baritone.launch.mixins;
import baritone.Baritone; import baritone.Baritone;
import baritone.event.events.RelativeMoveEvent; import baritone.event.events.RelativeMoveEvent;
import baritone.event.events.type.EventState; import baritone.event.events.type.EventState;
import baritone.utils.Helper; import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; 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) { private void preMoveRelative(float strafe, float up, float forward, float friction, CallbackInfo ci) {
Entity _this = (Entity) (Object) this; Entity _this = (Entity) (Object) this;
if (_this == Helper.mc.player) if (_this == Minecraft.getMinecraft().player)
Baritone.INSTANCE.getGameEventHandler().onPlayerRelativeMove(new RelativeMoveEvent(EventState.PRE)); 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) { private void postMoveRelative(float strafe, float up, float forward, float friction, CallbackInfo ci) {
Entity _this = (Entity) (Object) this; Entity _this = (Entity) (Object) this;
if (_this == Helper.mc.player) if (_this == Minecraft.getMinecraft().player)
Baritone.INSTANCE.getGameEventHandler().onPlayerRelativeMove(new RelativeMoveEvent(EventState.POST)); Baritone.INSTANCE.getGameEventHandler().onPlayerRelativeMove(new RelativeMoveEvent(EventState.POST));
} }
} }
src/main/java/baritone/utils/ExampleBaritoneControl.java
+2 -2
View File
@@ -22,6 +22,7 @@ import baritone.Settings;
import baritone.behavior.Behavior; import baritone.behavior.Behavior;
import baritone.behavior.impl.PathingBehavior; import baritone.behavior.impl.PathingBehavior;
import baritone.event.events.ChatEvent; import baritone.event.events.ChatEvent;
import baritone.map.Map;
import baritone.pathing.calc.AStarPathFinder; import baritone.pathing.calc.AStarPathFinder;
import baritone.pathing.goals.Goal; import baritone.pathing.goals.Goal;
import baritone.pathing.goals.GoalBlock; import baritone.pathing.goals.GoalBlock;
@@ -31,7 +32,6 @@ import baritone.pathing.movement.ActionCosts;
import baritone.pathing.movement.CalculationContext; import baritone.pathing.movement.CalculationContext;
import baritone.pathing.movement.Movement; import baritone.pathing.movement.Movement;
import baritone.utils.pathing.BetterBlockPos; import baritone.utils.pathing.BetterBlockPos;
import baritone.map.Map;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import java.util.ArrayList; 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(); Map.INSTANCE.writeImage();
} }
if (Baritone.settings().byLowerName.containsKey(msg.toLowerCase())) { if (Baritone.settings().byLowerName.containsKey(msg.toLowerCase())) {