Skip to content

Commit

Permalink
avery byte scuff btfo
Browse files Browse the repository at this point in the history
  • Loading branch information
leijurv committed Oct 11, 2019
1 parent 4230605 commit 5e9b439
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/main/java/baritone/behavior/InventoryBehavior.java
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public boolean selectThrowawayForLocation(boolean select, int x, int y, int z) {
public boolean throwaway(boolean select, Predicate<? super ItemStack> desired) {
EntityPlayerSP p = ctx.player();
NonNullList<ItemStack> inv = p.inventory.mainInventory;
for (byte i = 0; i < 9; i++) {
for (int i = 0; i < 9; i++) {
ItemStack item = inv.get(i);
// this usage of settings() is okay because it's only called once during pathing
// (while creating the CalculationContext at the very beginning)
Expand All @@ -171,7 +171,7 @@ public boolean throwaway(boolean select, Predicate<? super ItemStack> desired) {
// we've already checked above ^ and the main hand can't possible have an acceptablethrowawayitem
// so we need to select in the main hand something that doesn't right click
// so not a shovel, not a hoe, not a block, etc
for (byte i = 0; i < 9; i++) {
for (int i = 0; i < 9; i++) {
ItemStack item = inv.get(i);
if (item.isEmpty() || item.getItem() instanceof ItemPickaxe) {
if (select) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/baritone/utils/ToolSet.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ public boolean hasSilkTouch(ItemStack stack) {
* Calculate which tool on the hotbar is best for mining
*
* @param b the blockstate to be mined
* @return A byte containing the index in the tools array that worked best
* @return An int containing the index in the tools array that worked best
*/
public byte getBestSlot(Block b, boolean preferSilkTouch) {
byte best = 0;
public int getBestSlot(Block b, boolean preferSilkTouch) {
int best = 0;
double highestSpeed = Double.NEGATIVE_INFINITY;
int lowestCost = Integer.MIN_VALUE;
boolean bestSilkTouch = false;
IBlockState blockState = b.getDefaultState();
for (byte i = 0; i < 9; i++) {
for (int i = 0; i < 9; i++) {
ItemStack itemStack = player.inventory.getStackInSlot(i);
double speed = calculateSpeedVsBlock(itemStack, blockState);
boolean silkTouch = hasSilkTouch(itemStack);
Expand Down

0 comments on commit 5e9b439

Please sign in to comment.