RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

reformatted

This commit is contained in:
Leijurv 2018-11-12 21:01:40 -08:00
parent e81b6d4d96
commit 1ab3e61984
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/baritone/pathing/movement/movements/MovementParkour.java
View File

@ -77,20 +77,20 @@ public class MovementParkour extends Movement {
if (MovementHelper.avoidWalkingInto(adj.getBlock()) && adj.getBlock() != Blocks.WATER && adj.getBlock() != Blocks.FLOWING_WATER) { // magma sucks if (MovementHelper.avoidWalkingInto(adj.getBlock()) && adj.getBlock() != Blocks.WATER && adj.getBlock() != Blocks.FLOWING_WATER) { // magma sucks
return; return;
} }
if (MovementHelper.canWalkOn(context,x + xDiff, y - 1, z + zDiff, adj)) { // don't parkour if we could just traverse (for now) if (MovementHelper.canWalkOn(context, x + xDiff, y - 1, z + zDiff, adj)) { // don't parkour if we could just traverse (for now)
return; return;
} }
if (!MovementHelper.fullyPassable(context,x + xDiff, y, z + zDiff)) { if (!MovementHelper.fullyPassable(context, x + xDiff, y, z + zDiff)) {
return; return;
} }
if (!MovementHelper.fullyPassable(context,x + xDiff, y + 1, z + zDiff)) { if (!MovementHelper.fullyPassable(context, x + xDiff, y + 1, z + zDiff)) {
return; return;
} }
if (!MovementHelper.fullyPassable(context,x + xDiff, y + 2, z + zDiff)) { if (!MovementHelper.fullyPassable(context, x + xDiff, y + 2, z + zDiff)) {
return; return;
} }
if (!MovementHelper.fullyPassable(context,x, y + 2, z)) { if (!MovementHelper.fullyPassable(context, x, y + 2, z)) {
return; return;
} }
int maxJump; int maxJump;
@ -106,11 +106,11 @@ public class MovementParkour extends Movement {
for (int i = 2; i <= maxJump; i++) { for (int i = 2; i <= maxJump; i++) {
// TODO perhaps dest.up(3) doesn't need to be fullyPassable, just canWalkThrough, possibly? // TODO perhaps dest.up(3) doesn't need to be fullyPassable, just canWalkThrough, possibly?
for (int y2 = 0; y2 < 4; y2++) { for (int y2 = 0; y2 < 4; y2++) {
if (!MovementHelper.fullyPassable(context,x + xDiff * i, y + y2, z + zDiff * i)) { if (!MovementHelper.fullyPassable(context, x + xDiff * i, y + y2, z + zDiff * i)) {
return; return;
} }
} }
if (MovementHelper.canWalkOn(context,x + xDiff * i, y - 1, z + zDiff * i)) { if (MovementHelper.canWalkOn(context, x + xDiff * i, y - 1, z + zDiff * i)) {
res.x = x + xDiff * i; res.x = x + xDiff * i;
res.y = y; res.y = y;
res.z = z + zDiff * i; res.z = z + zDiff * i;
@ -143,7 +143,7 @@ public class MovementParkour extends Movement {
if (againstX == x + xDiff * 3 && againstZ == z + zDiff * 3) { // we can't turn around that fast if (againstX == x + xDiff * 3 && againstZ == z + zDiff * 3) { // we can't turn around that fast
continue; continue;
} }
if (MovementHelper.canPlaceAgainst(context,againstX, y - 1, againstZ)) { if (MovementHelper.canPlaceAgainst(context, againstX, y - 1, againstZ)) {
res.x = destX; res.x = destX;
res.y = y; res.y = y;
res.z = destZ; res.z = destZ;

3
src/main/java/baritone/utils/accessor/IAnvilChunkLoader.java
View File

@ -22,9 +22,8 @@ import baritone.cache.WorldProvider;
import java.io.File; import java.io.File;
/** /**
* @see WorldProvider
*
* @author Brady * @author Brady
* @see WorldProvider
* @since 8/4/2018 11:36 AM * @since 8/4/2018 11:36 AM
*/ */
public interface IAnvilChunkLoader { public interface IAnvilChunkLoader {

3
src/main/java/baritone/utils/accessor/IChunkProviderServer.java
View File

@ -21,9 +21,8 @@ import net.minecraft.world.WorldProvider;
import net.minecraft.world.chunk.storage.IChunkLoader; import net.minecraft.world.chunk.storage.IChunkLoader;
/** /**
* @see WorldProvider
*
* @author Brady * @author Brady
* @see WorldProvider
* @since 8/4/2018 11:33 AM * @since 8/4/2018 11:33 AM
*/ */
public interface IChunkProviderServer { public interface IChunkProviderServer {