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

might as well privatize

Browse Source
This commit is contained in:
Leijurv 2019-04-29 14:59:25 -07:00
parent 85eb7d8043
commit 9bf3a041d4
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/baritone/process/BuilderProcess.java
View File

@ -135,9 +135,8 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
} }
return state; return state;
} }
private Optional<Tuple<BetterBlockPos, Rotation>> toBreakNearPlayer(BuilderCalculationContext bcc) {
public Optional<Tuple<BetterBlockPos, Rotation>> toBreakNearPlayer(BuilderCalculationContext bcc) {
BetterBlockPos center = ctx.playerFeet(); BetterBlockPos center = ctx.playerFeet();
for (int dx = -5; dx <= 5; dx++) { for (int dx = -5; dx <= 5; dx++) {
for (int dy = 0; dy <= 5; dy++) { for (int dy = 0; dy <= 5; dy++) {
@ -177,7 +176,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
} }
} }
public Optional<Placement> searchForPlacables(BuilderCalculationContext bcc, List<IBlockState> desirableOnHotbar) { private Optional<Placement> searchForPlacables(BuilderCalculationContext bcc, List<IBlockState> desirableOnHotbar) {
BetterBlockPos center = ctx.playerFeet(); BetterBlockPos center = ctx.playerFeet();
for (int dx = -5; dx <= 5; dx++) { for (int dx = -5; dx <= 5; dx++) {
for (int dy = -5; dy <= 1; dy++) { for (int dy = -5; dy <= 1; dy++) {
@ -206,7 +205,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
return Optional.empty(); return Optional.empty();
} }
public Optional<Placement> possibleToPlace(IBlockState toPlace, int x, int y, int z, BlockStateInterface bsi) { private Optional<Placement> possibleToPlace(IBlockState toPlace, int x, int y, int z, BlockStateInterface bsi) {
for (EnumFacing against : EnumFacing.values()) { for (EnumFacing against : EnumFacing.values()) {
BetterBlockPos placeAgainstPos = new BetterBlockPos(x, y, z).offset(against); BetterBlockPos placeAgainstPos = new BetterBlockPos(x, y, z).offset(against);
IBlockState placeAgainstState = bsi.get0(placeAgainstPos); IBlockState placeAgainstState = bsi.get0(placeAgainstPos);
@ -234,8 +233,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
return Optional.empty(); return Optional.empty();
} }
private OptionalInt hasAnyItemThatWouldPlace(IBlockState desired, RayTraceResult result, Rotation rot) {
public OptionalInt hasAnyItemThatWouldPlace(IBlockState desired, RayTraceResult result, Rotation rot) {
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
ItemStack stack = ctx.player().inventory.mainInventory.get(i); ItemStack stack = ctx.player().inventory.mainInventory.get(i);
if (stack.isEmpty() || !(stack.getItem() instanceof ItemBlock)) { if (stack.isEmpty() || !(stack.getItem() instanceof ItemBlock)) {
@ -416,7 +414,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
return new PathingCommandContext(goal, PathingCommandType.FORCE_REVALIDATE_GOAL_AND_PATH, bcc); return new PathingCommandContext(goal, PathingCommandType.FORCE_REVALIDATE_GOAL_AND_PATH, bcc);
} }
public boolean recalc(BuilderCalculationContext bcc) { private boolean recalc(BuilderCalculationContext bcc) {
if (incorrectPositions == null) { if (incorrectPositions == null) {
incorrectPositions = new HashSet<>(); incorrectPositions = new HashSet<>();
fullRecalc(bcc); fullRecalc(bcc);
@ -431,7 +429,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
return !incorrectPositions.isEmpty(); return !incorrectPositions.isEmpty();
} }
public void trim(BuilderCalculationContext bcc) { private void trim(BuilderCalculationContext bcc) {
HashSet<BetterBlockPos> copy = new HashSet<>(incorrectPositions); HashSet<BetterBlockPos> copy = new HashSet<>(incorrectPositions);
copy.removeIf(pos -> pos.distanceSq(ctx.player().posX, ctx.player().posY, ctx.player().posZ) > 200); copy.removeIf(pos -> pos.distanceSq(ctx.player().posX, ctx.player().posY, ctx.player().posZ) > 200);
if (!copy.isEmpty()) { if (!copy.isEmpty()) {
@ -439,7 +437,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
} }
} }
public void recalcNearby(BuilderCalculationContext bcc) { private void recalcNearby(BuilderCalculationContext bcc) {
BetterBlockPos center = ctx.playerFeet(); BetterBlockPos center = ctx.playerFeet();
for (int dx = -5; dx <= 5; dx++) { for (int dx = -5; dx <= 5; dx++) {
for (int dy = -5; dy <= 5; dy++) { for (int dy = -5; dy <= 5; dy++) {
@ -464,7 +462,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
} }
} }
public void fullRecalc(BuilderCalculationContext bcc) { private void fullRecalc(BuilderCalculationContext bcc) {
incorrectPositions = new HashSet<>(); incorrectPositions = new HashSet<>();
for (int y = 0; y < schematic.heightY(); y++) { for (int y = 0; y < schematic.heightY(); y++) {
for (int z = 0; z < schematic.lengthZ(); z++) { for (int z = 0; z < schematic.lengthZ(); z++) {
@ -553,7 +551,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
} }
} }
public Goal placementgoal(BlockPos pos, BuilderCalculationContext bcc) { private Goal placementgoal(BlockPos pos, BuilderCalculationContext bcc) {
if (ctx.world().getBlockState(pos).getBlock() != Blocks.AIR) { if (ctx.world().getBlockState(pos).getBlock() != Blocks.AIR) {
return new GoalPlace(pos); return new GoalPlace(pos);
} }
@ -620,7 +618,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
return paused ? "Builder Paused" : "Building " + name; return paused ? "Builder Paused" : "Building " + name;
} }
public List<IBlockState> placable(int size) { private List<IBlockState> placable(int size) {
List<IBlockState> result = new ArrayList<>(); List<IBlockState> result = new ArrayList<>();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
ItemStack stack = ctx.player().inventory.mainInventory.get(i); ItemStack stack = ctx.player().inventory.mainInventory.get(i);
@ -635,7 +633,7 @@ public class BuilderProcess extends BaritoneProcessHelper implements IBuilderPro
return result; return result;
} }
public boolean valid(IBlockState current, IBlockState desired) { private boolean valid(IBlockState current, IBlockState desired) {
// TODO more complicated comparison logic I guess // TODO more complicated comparison logic I guess
return desired == null || current.equals(desired); return desired == null || current.equals(desired);
} }