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

I LOVE final

Browse Source
This commit is contained in:
Brady
2023-06-13 21:13:34 -05:00
parent 714ebb2c2d
commit ab3d9e9c47
7 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/baritone/Baritone.java
View File

@@ -49,8 +49,8 @@ import java.util.concurrent.TimeUnit;
*/
public class Baritone implements IBaritone {
private static ThreadPoolExecutor threadPool;
private static File dir;
private static final ThreadPoolExecutor threadPool;
private static final File dir;
static {
threadPool = new ThreadPoolExecutor(4, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>());
@@ -65,30 +65,30 @@ public class Baritone implements IBaritone {
private final Minecraft mc;
private GameEventHandler gameEventHandler;
private final GameEventHandler gameEventHandler;
private PathingBehavior pathingBehavior;
private LookBehavior lookBehavior;
private InventoryBehavior inventoryBehavior;
private WaypointBehavior waypointBehavior;
private InputOverrideHandler inputOverrideHandler;
private final PathingBehavior pathingBehavior;
private final LookBehavior lookBehavior;
private final InventoryBehavior inventoryBehavior;
private final WaypointBehavior waypointBehavior;
private final InputOverrideHandler inputOverrideHandler;
private FollowProcess followProcess;
private MineProcess mineProcess;
private GetToBlockProcess getToBlockProcess;
private CustomGoalProcess customGoalProcess;
private BuilderProcess builderProcess;
private ExploreProcess exploreProcess;
private BackfillProcess backfillProcess;
private FarmProcess farmProcess;
private InventoryPauserProcess inventoryPauserProcess;
private final FollowProcess followProcess;
private final MineProcess mineProcess;
private final GetToBlockProcess getToBlockProcess;
private final CustomGoalProcess customGoalProcess;
private final BuilderProcess builderProcess;
private final ExploreProcess exploreProcess;
private final BackfillProcess backfillProcess;
private final FarmProcess farmProcess;
private final InventoryPauserProcess inventoryPauserProcess;
private PathingControlManager pathingControlManager;
private SelectionManager selectionManager;
private CommandManager commandManager;
private final PathingControlManager pathingControlManager;
private final SelectionManager selectionManager;
private final CommandManager commandManager;
private IPlayerContext playerContext;
private WorldProvider worldProvider;
private final IPlayerContext playerContext;
private final WorldProvider worldProvider;
public BlockStateInterface bsi;
@@ -101,11 +101,11 @@ public class Baritone implements IBaritone {
{
// the Behavior constructor calls baritone.registerBehavior(this) so this populates the behaviors arraylist
pathingBehavior = new PathingBehavior(this);
lookBehavior = new LookBehavior(this);
inventoryBehavior = new InventoryBehavior(this);
inputOverrideHandler = new InputOverrideHandler(this);
waypointBehavior = new WaypointBehavior(this);
this.registerBehavior(pathingBehavior = new PathingBehavior(this));
this.registerBehavior(lookBehavior = new LookBehavior(this));
this.registerBehavior(inventoryBehavior = new InventoryBehavior(this));
this.registerBehavior(inputOverrideHandler = new InputOverrideHandler(this));
this.registerBehavior(waypointBehavior = new WaypointBehavior(this));
}
this.pathingControlManager = new PathingControlManager(this);

1
src/main/java/baritone/behavior/Behavior.java
View File

@@ -35,6 +35,5 @@ public class Behavior implements IBehavior {
protected Behavior(Baritone baritone) {
this.baritone = baritone;
this.ctx = baritone.getPlayerContext();
baritone.registerBehavior(this);
}
}

8
src/main/java/baritone/behavior/PathingBehavior.java
View File

@@ -36,6 +36,7 @@ import baritone.pathing.path.PathExecutor;
import baritone.utils.PathRenderer;
import baritone.utils.PathingCommandContext;
import baritone.utils.pathing.Favoring;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.util.math.BlockPos;
import java.util.ArrayList;
@@ -237,13 +238,14 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
@Override
public void onPlayerUpdate(PlayerUpdateEvent event) {
if (current != null) {
final GameSettings settings = baritone.getMinecraft().gameSettings;
switch (event.getState()) {
case PRE:
lastAutoJump = mc.gameSettings.autoJump;
mc.gameSettings.autoJump = false;
lastAutoJump = settings.autoJump;
settings.autoJump = false;
break;
case POST:
mc.gameSettings.autoJump = lastAutoJump;
settings.autoJump = lastAutoJump;
break;
default:
break;

2
src/main/java/baritone/cache/WorldProvider.java vendored
View File

@@ -44,7 +44,7 @@ public class WorldProvider implements IWorldProvider, Helper {
private static final Map<Path, WorldData> worldCache = new HashMap<>(); // this is how the bots have the same cached world
private Baritone baritone;
private final Baritone baritone;
private WorldData currentWorld;
private World mcWorld; // this let's us detect a broken load/unload hook

3
src/main/java/baritone/utils/BlockBreakHelper.java
View File

@@ -17,7 +17,6 @@
package baritone.utils;
import baritone.api.utils.Helper;
import baritone.api.utils.IPlayerContext;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.RayTraceResult;
@@ -26,7 +25,7 @@ import net.minecraft.util.math.RayTraceResult;
* @author Brady
* @since 8/25/2018
*/
public final class BlockBreakHelper implements Helper {
public final class BlockBreakHelper {
private final IPlayerContext ctx;
private boolean didBreakLastTick;

3
src/main/java/baritone/utils/BlockPlaceHelper.java
View File

@@ -18,13 +18,12 @@
package baritone.utils;
import baritone.Baritone;
import baritone.api.utils.Helper;
import baritone.api.utils.IPlayerContext;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.RayTraceResult;
public class BlockPlaceHelper implements Helper {
public class BlockPlaceHelper {
private final IPlayerContext ctx;
private int rightClickTimer;

4
src/main/java/baritone/utils/player/BaritonePlayerContext.java
View File

@@ -20,7 +20,6 @@ package baritone.utils.player;
import baritone.Baritone;
import baritone.api.cache.IWorldData;
import baritone.api.utils.*;
import baritone.behavior.LookBehavior;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.util.math.RayTraceResult;
@@ -66,8 +65,7 @@ public final class BaritonePlayerContext implements IPlayerContext {
@Override
public Rotation playerRotations() {
return ((LookBehavior) this.baritone.getLookBehavior()).getEffectiveRotation()
.orElseGet(IPlayerContext.super::playerRotations);
return this.baritone.getLookBehavior().getEffectiveRotation().orElseGet(IPlayerContext.super::playerRotations);
}
@Override