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

Cache the block break time in ToolSet, fixes #80

Browse Source
This commit is contained in:
Brady 2018-08-22 21:33:56 -05:00
parent 9dcadc979e
commit 6a5bdf9023
No known key found for this signature in database
GPG Key ID: 73A788379A197567
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,13 @@ public class ToolSet implements Helper {
* The values in this map are *not* hotbar slots indexes, they need to be looked up in slots * The values in this map are *not* hotbar slots indexes, they need to be looked up in slots
* in order to be converted into hotbar slots. * in order to be converted into hotbar slots.
*/ */
private Map<Block, Byte> cache = new HashMap<>(); private Map<Block, Byte> slotCache = new HashMap<>();
/**
* A cache mapping a {@link IBlockState} to how long it will take to break
* with this toolset, given the optimum tool is used.
*/
private Map<IBlockState, Double> breakStrengthCache = new HashMap<>();
/** /**
* Create a toolset from the current player's inventory (but don't calculate any hardness values just yet) * Create a toolset from the current player's inventory (but don't calculate any hardness values just yet)
@ -96,7 +102,7 @@ public class ToolSet implements Helper {
* @return get which tool on the hotbar is best for mining it * @return get which tool on the hotbar is best for mining it
*/ */
public Item getBestTool(IBlockState state) { public Item getBestTool(IBlockState state) {
return tools.get(cache.computeIfAbsent(state.getBlock(), block -> getBestToolIndex(state))); return tools.get(slotCache.computeIfAbsent(state.getBlock(), block -> getBestToolIndex(state)));
} }
/** /**
@ -129,7 +135,7 @@ public class ToolSet implements Helper {
* @return a byte indicating which hotbar slot worked best * @return a byte indicating which hotbar slot worked best
*/ */
public byte getBestSlot(IBlockState state) { public byte getBestSlot(IBlockState state) {
return slots.get(cache.computeIfAbsent(state.getBlock(), block -> getBestToolIndex(state))); return slots.get(slotCache.computeIfAbsent(state.getBlock(), block -> getBestToolIndex(state)));
} }
/** /**
@ -140,6 +146,18 @@ public class ToolSet implements Helper {
* @return how long it would take in ticks * @return how long it would take in ticks
*/ */
public double getStrVsBlock(IBlockState state, BlockPos pos) { public double getStrVsBlock(IBlockState state, BlockPos pos) {
return this.breakStrengthCache.computeIfAbsent(state, s -> calculateStrVsBlock(s, pos));
}
/**
* Calculates how long would it take to mine the specified block given the best tool
* in this toolset is used.
*
* @param state the blockstate to be mined
* @param pos the blockpos to be mined
* @return how long it would take in ticks
*/
private double calculateStrVsBlock(IBlockState state, BlockPos pos) {
// Calculate the slot with the best item // Calculate the slot with the best item
byte slot = this.getBestSlot(state); byte slot = this.getBestSlot(state);