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

fixed setting name

Browse Source
This commit is contained in:
Leijurv 2018-08-21 13:39:28 -07:00
parent 530f87ad14
commit 40dd2e33f6
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/baritone/bot/Settings.java
View File

@ -157,7 +157,7 @@ public class Settings {
/** /**
* The big one. Download all chunks in simplified 2-bit format and save them for better very-long-distance pathing. * The big one. Download all chunks in simplified 2-bit format and save them for better very-long-distance pathing.
*/ */
public Setting<Boolean> chuckCaching = new Setting<>(false); public Setting<Boolean> chunkCaching = new Setting<>(true);
/** /**
* Print all the debug messages to chat * Print all the debug messages to chat

4
src/main/java/baritone/bot/event/GameEventHandler.java
View File

@ -108,7 +108,7 @@ public final class GameEventHandler implements IGameEventListener, Helper {
&& type == ChunkEvent.Type.UNLOAD && type == ChunkEvent.Type.UNLOAD
&& mc.world.getChunkProvider().isChunkGeneratedAt(event.getX(), event.getZ()); && mc.world.getChunkProvider().isChunkGeneratedAt(event.getX(), event.getZ());
if (Baritone.settings().chuckCaching.get()) { if (Baritone.settings().chunkCaching.get()) {
if (isPostPopulate || isPreUnload) { if (isPostPopulate || isPreUnload) {
CachedWorldProvider.INSTANCE.ifWorldLoaded(world -> CachedWorldProvider.INSTANCE.ifWorldLoaded(world ->
world.updateCachedChunk(event.getX(), event.getZ(), world.updateCachedChunk(event.getX(), event.getZ(),
@ -132,7 +132,7 @@ public final class GameEventHandler implements IGameEventListener, Helper {
@Override @Override
public void onWorldEvent(WorldEvent event) { public void onWorldEvent(WorldEvent event) {
if (Baritone.settings().chuckCaching.get()) { if (Baritone.settings().chunkCaching.get()) {
CachedWorldProvider cache = CachedWorldProvider.INSTANCE; CachedWorldProvider cache = CachedWorldProvider.INSTANCE;
switch (event.getState()) { switch (event.getState()) {

2
src/main/java/baritone/bot/pathing/calc/AStarPathFinder.java
View File

@ -94,7 +94,7 @@ public class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
int numNodes = 0; int numNodes = 0;
int numEmptyChunk = 0; int numEmptyChunk = 0;
boolean favoring = favoredPositions.isPresent(); boolean favoring = favoredPositions.isPresent();
boolean cache = Baritone.settings().chuckCaching.get(); // grab all settings beforehand so that changing settings during pathing doesn't cause a crash or unpredictable behavior boolean cache = Baritone.settings().chunkCaching.get(); // grab all settings beforehand so that changing settings during pathing doesn't cause a crash or unpredictable behavior
int pathingMaxChunkBorderFetch = Baritone.settings().pathingMaxChunkBorderFetch.get(); int pathingMaxChunkBorderFetch = Baritone.settings().pathingMaxChunkBorderFetch.get();
double favorCoeff = Baritone.settings().backtrackCostFavoringCoefficient.get(); double favorCoeff = Baritone.settings().backtrackCostFavoringCoefficient.get();
boolean minimumImprovementRepropagation = Baritone.settings().minimumImprovementRepropagation.get(); boolean minimumImprovementRepropagation = Baritone.settings().minimumImprovementRepropagation.get();

2
src/main/java/baritone/bot/utils/BlockStateInterface.java
View File

@ -41,7 +41,7 @@ public class BlockStateInterface implements Helper {
if (chunk.isLoaded()) { if (chunk.isLoaded()) {
return chunk.getBlockState(pos); return chunk.getBlockState(pos);
} }
if (Baritone.settings().chuckCaching.get()) { if (Baritone.settings().chunkCaching.get()) {
CachedWorld world = CachedWorldProvider.INSTANCE.getCurrentWorld(); CachedWorld world = CachedWorldProvider.INSTANCE.getCurrentWorld();
if (world != null) { if (world != null) {
PathingBlockType type = world.getBlockType(pos); PathingBlockType type = world.getBlockType(pos);

5
src/main/java/baritone/bot/utils/ExampleBaritoneControl.java
View File

@ -23,7 +23,10 @@ import baritone.bot.behavior.Behavior;
import baritone.bot.behavior.impl.PathingBehavior; import baritone.bot.behavior.impl.PathingBehavior;
import baritone.bot.event.events.ChatEvent; import baritone.bot.event.events.ChatEvent;
import baritone.bot.pathing.calc.AStarPathFinder; import baritone.bot.pathing.calc.AStarPathFinder;
import baritone.bot.pathing.goals.*; import baritone.bot.pathing.goals.Goal;
import baritone.bot.pathing.goals.GoalBlock;
import baritone.bot.pathing.goals.GoalXZ;
import baritone.bot.pathing.goals.GoalYLevel;
import baritone.bot.pathing.movement.ActionCosts; import baritone.bot.pathing.movement.ActionCosts;
import baritone.bot.pathing.movement.CalculationContext; import baritone.bot.pathing.movement.CalculationContext;
import baritone.bot.pathing.movement.Movement; import baritone.bot.pathing.movement.Movement;