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

Merge 136d040ee0 into f2679bea29

This commit is contained in:
James 2023-08-26 21:11:04 +01:00 committed by GitHub
parent f2679bea29 136d040ee0
commit 025b3e199c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/baritone/utils/ToolSet.java
View File

@ -123,6 +123,8 @@ public class ToolSet {
double highestSpeed = Double.NEGATIVE_INFINITY;
int lowestCost = Integer.MIN_VALUE;
boolean bestSilkTouch = false;
int bestFortune = Integer.MIN_VALUE;
boolean isCrop = b instanceof CropBlock;
IBlockState blockState = b.getDefaultState();
for (int i = 0; i < 9; i++) {
ItemStack itemStack = player.inventory.getStackInSlot(i);
@ -135,11 +137,13 @@ public class ToolSet {
}
double speed = calculateSpeedVsBlock(itemStack, blockState);
boolean silkTouch = hasSilkTouch(itemStack);
int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemStack);
if (speed > highestSpeed) {
highestSpeed = speed;
best = i;
lowestCost = getMaterialCost(itemStack);
bestSilkTouch = silkTouch;
bestFortune = fortune;
} else if (speed == highestSpeed) {
int cost = getMaterialCost(itemStack);
if ((cost < lowestCost && (silkTouch || !bestSilkTouch)) ||
@ -148,6 +152,7 @@ public class ToolSet {
best = i;
lowestCost = cost;
bestSilkTouch = silkTouch;
bestFortune = fortune;
}
}
}