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

cull far away chunks from the cache

Browse Source
This commit is contained in:
Babbaj
2023-07-16 01:19:51 -04:00
parent 6f99f891dc
commit 76d3a13f58
4 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/baritone/behavior/ElytraBehavior.java
View File

@@ -118,9 +118,11 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
private Solution pendingSolution;
private boolean solveNextTick;
private long timeLastCacheCull = 0L;
// auto swap
private int invTickCountdown = 0;
private final Queue<Runnable> transactionQueue = new LinkedList<>();
private final Queue<Runnable> invTransactionQueue = new LinkedList<>();
private ElytraBehavior(Baritone baritone) {
super(baritone);
@@ -516,6 +518,11 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
if (event.getType() == TickEvent.Type.OUT) {
return;
}
final long now = System.currentTimeMillis();
if ((now - this.timeLastCacheCull) / 1000 > Baritone.settings().elytraTimeBetweenCacheCullSecs.value) {
this.context.queueCacheCulling(ctx.player().chunkCoordX, ctx.player().chunkCoordZ, Baritone.settings().elytraCacheCullDistance.value);
this.timeLastCacheCull = now;
}
// Fetch the previous solution, regardless of if it's going to be used
this.pendingSolution = null;
@@ -1264,7 +1271,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
private void tickInventoryTransactions() {
if (invTickCountdown <= 0) {
Runnable r = transactionQueue.poll();
Runnable r = invTransactionQueue.poll();
if (r != null) {
r.run();
invTickCountdown = Baritone.settings().ticksBetweenInventoryMoves.value;
@@ -1274,7 +1281,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
}
private void queueWindowClick(int windowId, int slotId, int button, ClickType type) {
transactionQueue.add(() -> ctx.playerController().windowClick(windowId, slotId, button, type, ctx.player()));
invTransactionQueue.add(() -> ctx.playerController().windowClick(windowId, slotId, button, type, ctx.player()));
}
private int findGoodElytra() {
@@ -1289,7 +1296,7 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
}
private void trySwapElytra() {
if (!Baritone.settings().elytraAutoSwap.value || !transactionQueue.isEmpty()) {
if (!Baritone.settings().elytraAutoSwap.value || !invTransactionQueue.isEmpty()) {
return;
}

4
src/main/java/baritone/behavior/elytra/NetherPathfinderContext.java
View File

@@ -57,6 +57,10 @@ public final class NetherPathfinderContext {
this.executor = Executors.newSingleThreadExecutor();
}
public void queueCacheCulling(int chunkX, int chunkZ, int maxDistanceBlocks) {
this.executor.execute(() -> NetherPathfinder.cullFarChunks(this.context, chunkX, chunkZ, maxDistanceBlocks));
}
public void queueForPacking(final Chunk chunkIn) {
final SoftReference<Chunk> ref = new SoftReference<>(chunkIn);
this.executor.execute(() -> {