From 136d040ee0fcfabaeba698b3542358b6beef9741 Mon Sep 17 00:00:00 2001 From: James Edington Date: Tue, 27 Apr 2021 22:55:37 -0500 Subject: [PATCH] feature/enhancement/farm-fortune: Initial commit --- src/main/java/baritone/utils/ToolSet.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/baritone/utils/ToolSet.java b/src/main/java/baritone/utils/ToolSet.java index 0e153e77f..b7a704dd4 100644 --- a/src/main/java/baritone/utils/ToolSet.java +++ b/src/main/java/baritone/utils/ToolSet.java @@ -122,6 +122,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); @@ -134,11 +136,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)) || @@ -147,6 +151,7 @@ public class ToolSet { best = i; lowestCost = cost; bestSilkTouch = silkTouch; + bestFortune = fortune; } } }