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

more settings

Browse Source
This commit is contained in:
leijurv 2018-08-13 20:17:16 -07:00
parent f881ba5e59
commit 04005b6e59
6 changed files with 38 additions and 17 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

@ -29,6 +29,8 @@ public class Settings {
public boolean chuckCaching = false; public boolean chuckCaching = false;
public boolean allowWaterBucketFall = true; public boolean allowWaterBucketFall = true;
public int planningTickLookAhead = 150; public int planningTickLookAhead = 150;
public boolean renderPath = true;
public boolean chatDebug = true;
Settings() { Settings() {

6
src/main/java/baritone/bot/behavior/impl/PathingBehavior.java
View File

@ -42,7 +42,8 @@ public class PathingBehavior extends Behavior {
public static final PathingBehavior INSTANCE = new PathingBehavior(); public static final PathingBehavior INSTANCE = new PathingBehavior();
private PathingBehavior() {} private PathingBehavior() {
}
private PathExecutor current; private PathExecutor current;
private PathExecutor next; private PathExecutor next;
@ -274,6 +275,9 @@ public class PathingBehavior extends Behavior {
@Override @Override
public void onRenderPass(RenderEvent event) { public void onRenderPass(RenderEvent event) {
if (!Baritone.settings().renderPath) {
return;
}
// System.out.println("Render passing"); // System.out.println("Render passing");
// System.out.println(event.getPartialTicks()); // System.out.println(event.getPartialTicks());
float partialTicks = event.getPartialTicks(); float partialTicks = event.getPartialTicks();

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

@ -130,17 +130,19 @@ public final class GameEventHandler implements IGameEventListener, Helper {
@Override @Override
public void onWorldEvent(WorldEvent event) { public void onWorldEvent(WorldEvent event) {
CachedWorldProvider cache = CachedWorldProvider.INSTANCE; if (Baritone.settings().chuckCaching) {
CachedWorldProvider cache = CachedWorldProvider.INSTANCE;
switch (event.getState()) { switch (event.getState()) {
case PRE: case PRE:
cache.ifWorldLoaded(CachedWorld::save); cache.ifWorldLoaded(CachedWorld::save);
break; break;
case POST: case POST:
cache.closeWorld(); cache.closeWorld();
if (event.getWorld() != null) if (event.getWorld() != null)
cache.initWorld(event.getWorld()); cache.initWorld(event.getWorld());
break; break;
}
} }
dispatch(behavior -> behavior.onWorldEvent(event)); dispatch(behavior -> behavior.onWorldEvent(event));

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

@ -34,6 +34,7 @@
package baritone.bot.pathing.calc; package baritone.bot.pathing.calc;
import baritone.bot.Baritone;
import baritone.bot.chunk.CachedWorldProvider; import baritone.bot.chunk.CachedWorldProvider;
import baritone.bot.pathing.calc.openset.BinaryHeapOpenSet; import baritone.bot.pathing.calc.openset.BinaryHeapOpenSet;
import baritone.bot.pathing.calc.openset.IOpenSet; import baritone.bot.pathing.calc.openset.IOpenSet;
@ -86,6 +87,7 @@ public class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
int numNodes = 0; int numNodes = 0;
CalculationContext calcContext = new CalculationContext(); CalculationContext calcContext = new CalculationContext();
int numEmptyChunk = 0; int numEmptyChunk = 0;
boolean cache = Baritone.settings().chuckCaching;
while (!openSet.isEmpty() && numEmptyChunk < 50 && System.currentTimeMillis() < timeoutTime) { while (!openSet.isEmpty() && numEmptyChunk < 50 && System.currentTimeMillis() < timeoutTime) {
if (slowPath) { if (slowPath) {
try { try {
@ -117,11 +119,14 @@ public class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
} }
boolean isPositionCached = false; boolean isPositionCached = false;
if (CachedWorldProvider.INSTANCE.getCurrentWorld() != null) if (cache) {
if (CachedWorldProvider.INSTANCE.getCurrentWorld().getBlockType(movementToGetToNeighbor.getDest()) != null) if (CachedWorldProvider.INSTANCE.getCurrentWorld() != null) {
isPositionCached = true; if (CachedWorldProvider.INSTANCE.getCurrentWorld().getBlockType(movementToGetToNeighbor.getDest()) != null) {
isPositionCached = true;
if (Minecraft.getMinecraft().world.getChunk(movementToGetToNeighbor.getDest()) instanceof EmptyChunk && !isPositionCached) { }
}
}
if (!isPositionCached && Minecraft.getMinecraft().world.getChunk(movementToGetToNeighbor.getDest()) instanceof EmptyChunk) {
numEmptyChunk++; numEmptyChunk++;
continue; continue;
} }

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

@ -17,6 +17,7 @@
package baritone.bot.utils; package baritone.bot.utils;
import baritone.bot.Baritone;
import baritone.bot.chunk.CachedWorld; import baritone.bot.chunk.CachedWorld;
import baritone.bot.chunk.CachedWorldProvider; import baritone.bot.chunk.CachedWorldProvider;
import baritone.bot.utils.pathing.PathingBlockType; import baritone.bot.utils.pathing.PathingBlockType;
@ -39,7 +40,8 @@ public class BlockStateInterface implements Helper {
Chunk chunk = mc.world.getChunk(pos); Chunk chunk = mc.world.getChunk(pos);
if (chunk.isLoaded()) { if (chunk.isLoaded()) {
return chunk.getBlockState(pos); return chunk.getBlockState(pos);
} else { }
if(Baritone.settings().chuckCaching) {
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);

6
src/main/java/baritone/bot/utils/Helper.java
View File

@ -17,6 +17,7 @@
package baritone.bot.utils; package baritone.bot.utils;
import baritone.bot.Baritone;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.gui.GuiNewChat; import net.minecraft.client.gui.GuiNewChat;
@ -69,6 +70,11 @@ public interface Helper {
} }
default void displayChatMessageRaw(String message) { default void displayChatMessageRaw(String message) {
if (!Baritone.settings().chatDebug) {
System.out.println("Suppressed debug message:");
System.out.println(message);
return;
}
GuiNewChat gui = mc.ingameGUI.getChatGUI(); GuiNewChat gui = mc.ingameGUI.getChatGUI();
int normalMaxWidth = MathHelper.floor((float) gui.getChatWidth() / gui.getChatScale()); int normalMaxWidth = MathHelper.floor((float) gui.getChatWidth() / gui.getChatScale());
int widthWithStyleFormat = normalMaxWidth - 2; int widthWithStyleFormat = normalMaxWidth - 2;