standardize on this

This commit is contained in:
Leijurv 2019-09-19 13:40:46 -07:00
parent 23a592ec01
commit 0a38e6f690
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
101 changed files with 110 additions and 0 deletions

View File

@ -1022,6 +1022,7 @@ public final class Settings {
public final Map<Setting<?>, Type> settingTypes; public final Map<Setting<?>, Type> settingTypes;
public final class Setting<T> { public final class Setting<T> {
public T value; public T value;
public final T defaultValue; public final T defaultValue;
private String name; private String name;

View File

@ -20,5 +20,6 @@ package baritone.api.accessor;
import java.net.URI; import java.net.URI;
public interface IGuiScreen { public interface IGuiScreen {
void openLink(URI url); void openLink(URI url);
} }

View File

@ -18,5 +18,6 @@
package baritone.api.accessor; package baritone.api.accessor;
public interface IItemStack { public interface IItemStack {
int getBaritoneHash(); int getBaritoneHash();
} }

View File

@ -24,6 +24,7 @@ import baritone.api.event.events.type.Overrideable;
* @author LoganDark * @author LoganDark
*/ */
public abstract class TabCompleteEvent extends Cancellable { public abstract class TabCompleteEvent extends Cancellable {
public final Overrideable<String> prefix; public final Overrideable<String> prefix;
public final Overrideable<String[]> completions; public final Overrideable<String[]> completions;
@ -37,12 +38,14 @@ public abstract class TabCompleteEvent extends Cancellable {
} }
public static final class Pre extends TabCompleteEvent { public static final class Pre extends TabCompleteEvent {
public Pre(String prefix) { public Pre(String prefix) {
super(prefix, null); super(prefix, null);
} }
} }
public static final class Post extends TabCompleteEvent { public static final class Post extends TabCompleteEvent {
public Post(String prefix, String[] completions) { public Post(String prefix, String[] completions) {
super(prefix, completions); super(prefix, completions);
} }

View File

@ -28,6 +28,7 @@ package baritone.api.pathing.goals;
* @author LoganDark * @author LoganDark
*/ */
public class GoalInverted implements Goal { public class GoalInverted implements Goal {
public final Goal origin; public final Goal origin;
public GoalInverted(Goal origin) { public GoalInverted(Goal origin) {

View File

@ -22,6 +22,7 @@ import baritone.api.utils.interfaces.IGoalRenderPos;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
public class GoalNear implements Goal, IGoalRenderPos { public class GoalNear implements Goal, IGoalRenderPos {
private final int x; private final int x;
private final int y; private final int y;
private final int z; private final int z;

View File

@ -25,6 +25,7 @@ import net.minecraft.util.math.BlockPos;
* Dig a tunnel in a certain direction, but if you have to deviate from the path, go back to where you started * Dig a tunnel in a certain direction, but if you have to deviate from the path, go back to where you started
*/ */
public class GoalStrictDirection implements Goal { public class GoalStrictDirection implements Goal {
public final int x; public final int x;
public final int y; public final int y;
public final int z; public final int z;

View File

@ -20,6 +20,7 @@ package baritone.api.process;
import java.nio.file.Path; import java.nio.file.Path;
public interface IExploreProcess extends IBaritoneProcess { public interface IExploreProcess extends IBaritoneProcess {
void explore(int centerX, int centerZ); void explore(int centerX, int centerZ);
void applyJsonFilter(Path path, boolean invert) throws Exception; void applyJsonFilter(Path path, boolean invert) throws Exception;

View File

@ -18,5 +18,6 @@
package baritone.api.process; package baritone.api.process;
public interface IFarmProcess extends IBaritoneProcess { public interface IFarmProcess extends IBaritoneProcess {
void farm(); void farm();
} }

View File

@ -28,6 +28,7 @@ import java.util.Arrays;
* @since 9/23/2018 * @since 9/23/2018
*/ */
public interface IMineProcess extends IBaritoneProcess { public interface IMineProcess extends IBaritoneProcess {
/** /**
* Begin to search for and mine the specified blocks until * Begin to search for and mine the specified blocks until
* the number of specified items to get from the blocks that * the number of specified items to get from the blocks that

View File

@ -20,6 +20,7 @@ package baritone.api.schematic;
import baritone.api.utils.ISchematic; import baritone.api.utils.ISchematic;
public abstract class AbstractSchematic implements ISchematic { public abstract class AbstractSchematic implements ISchematic {
protected int x; protected int x;
protected int y; protected int y;
protected int z; protected int z;

View File

@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class CompositeSchematic extends AbstractSchematic { public class CompositeSchematic extends AbstractSchematic {
private final List<CompositeSchematicEntry> schematics; private final List<CompositeSchematicEntry> schematics;
private CompositeSchematicEntry[] schematicArr; private CompositeSchematicEntry[] schematicArr;

View File

@ -20,6 +20,7 @@ package baritone.api.schematic;
import baritone.api.utils.ISchematic; import baritone.api.utils.ISchematic;
public class CompositeSchematicEntry { public class CompositeSchematicEntry {
public final ISchematic schematic; public final ISchematic schematic;
public final int x; public final int x;
public final int y; public final int y;

View File

@ -24,6 +24,7 @@ import net.minecraft.init.Blocks;
import java.util.List; import java.util.List;
public class FillSchematic extends AbstractSchematic { public class FillSchematic extends AbstractSchematic {
private final BlockOptionalMeta bom; private final BlockOptionalMeta bom;
public FillSchematic(int x, int y, int z, BlockOptionalMeta bom) { public FillSchematic(int x, int y, int z, BlockOptionalMeta bom) {

View File

@ -23,6 +23,7 @@ import net.minecraft.block.state.IBlockState;
import java.util.List; import java.util.List;
public abstract class MaskSchematic extends AbstractSchematic { public abstract class MaskSchematic extends AbstractSchematic {
private final ISchematic schematic; private final ISchematic schematic;
public MaskSchematic(ISchematic schematic) { public MaskSchematic(ISchematic schematic) {

View File

@ -22,6 +22,7 @@ import baritone.api.utils.ISchematic;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
public class ReplaceSchematic extends MaskSchematic { public class ReplaceSchematic extends MaskSchematic {
private final BlockOptionalMetaLookup filter; private final BlockOptionalMetaLookup filter;
private final Boolean[][][] cache; private final Boolean[][][] cache;

View File

@ -21,6 +21,7 @@ import baritone.api.utils.ISchematic;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
public class ShellSchematic extends MaskSchematic { public class ShellSchematic extends MaskSchematic {
public ShellSchematic(ISchematic schematic) { public ShellSchematic(ISchematic schematic) {
super(schematic); super(schematic);
} }

View File

@ -21,6 +21,7 @@ import baritone.api.utils.ISchematic;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
public class WallsSchematic extends MaskSchematic { public class WallsSchematic extends MaskSchematic {
public WallsSchematic(ISchematic schematic) { public WallsSchematic(ISchematic schematic) {
super(schematic); super(schematic);
} }

View File

@ -27,6 +27,7 @@ import net.minecraft.util.math.Vec3i;
* types of build commands, however it can be used for anything. * types of build commands, however it can be used for anything.
*/ */
public interface ISelection { public interface ISelection {
/** /**
* @return The first corner of this selection. This is meant to preserve the user's original first corner. * @return The first corner of this selection. This is meant to preserve the user's original first corner.
*/ */

View File

@ -25,6 +25,7 @@ import net.minecraft.util.EnumFacing;
* the current selection. * the current selection.
*/ */
public interface ISelectionManager { public interface ISelectionManager {
/** /**
* Adds a new selection. The added selection is returned. * Adds a new selection. The added selection is returned.
* *

View File

@ -34,6 +34,7 @@ import javax.annotation.Nonnull;
* @author leijurv * @author leijurv
*/ */
public final class BetterBlockPos extends BlockPos { public final class BetterBlockPos extends BlockPos {
public final int x; public final int x;
public final int y; public final int y;
public final int z; public final int z;

View File

@ -38,6 +38,7 @@ import java.util.stream.Collectors;
import static java.util.Objects.isNull; import static java.util.Objects.isNull;
public final class BlockOptionalMeta { public final class BlockOptionalMeta {
private final Block block; private final Block block;
private final int meta; private final int meta;
private final boolean noMeta; private final boolean noMeta;

View File

@ -27,6 +27,7 @@ import java.util.List;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class BlockOptionalMetaLookup { public class BlockOptionalMetaLookup {
private final BlockOptionalMeta[] boms; private final BlockOptionalMeta[] boms;
public BlockOptionalMetaLookup(BlockOptionalMeta... boms) { public BlockOptionalMetaLookup(BlockOptionalMeta... boms) {

View File

@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
public class BlockUtils { public class BlockUtils {
private static transient Map<String, Block> resourceCache = new HashMap<>(); private static transient Map<String, Block> resourceCache = new HashMap<>();
public static String blockToString(Block block) { public static String blockToString(Block block) {

View File

@ -51,6 +51,7 @@ import static java.util.Objects.isNull;
import static java.util.Objects.nonNull; import static java.util.Objects.nonNull;
public class BaritoneChatControl implements Helper, AbstractGameEventListener { public class BaritoneChatControl implements Helper, AbstractGameEventListener {
public final IBaritone baritone; public final IBaritone baritone;
public final IPlayerContext ctx; public final IPlayerContext ctx;
public final Settings settings = BaritoneAPI.getSettings(); public final Settings settings = BaritoneAPI.getSettings();

View File

@ -32,6 +32,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
public abstract class Command implements Helper { public abstract class Command implements Helper {
protected IBaritone baritone; protected IBaritone baritone;
protected IPlayerContext ctx; protected IPlayerContext ctx;
protected Minecraft MC = mc; protected Minecraft MC = mc;

View File

@ -20,5 +20,6 @@ package baritone.api.utils.interfaces;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
public interface IGoalRenderPos { public interface IGoalRenderPos {
BlockPos getGoalPos(); BlockPos getGoalPos();
} }

View File

@ -26,6 +26,7 @@ import org.spongepowered.asm.mixin.Unique;
@Mixin(BitArray.class) @Mixin(BitArray.class)
public abstract class MixinBitArray implements IBitArray { public abstract class MixinBitArray implements IBitArray {
@Shadow @Shadow
@Final @Final
private long[] longArray; private long[] longArray;

View File

@ -30,6 +30,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(BlockStateContainer.class) @Mixin(BlockStateContainer.class)
public abstract class MixinBlockStateContainer implements IBlockStateContainer { public abstract class MixinBlockStateContainer implements IBlockStateContainer {
@Shadow @Shadow
protected BitArray storage; protected BitArray storage;

View File

@ -25,6 +25,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(GuiChat.ChatTabCompleter.class) @Mixin(GuiChat.ChatTabCompleter.class)
public abstract class MixinChatTabCompleter extends MixinTabCompleter { public abstract class MixinChatTabCompleter extends MixinTabCompleter {
@Inject( @Inject(
method = "<init>*", method = "<init>*",
at = @At("RETURN") at = @At("RETURN")

View File

@ -28,6 +28,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(GuiChat.class) @Mixin(GuiChat.class)
public abstract class MixinGuiChat implements net.minecraft.util.ITabCompleter { public abstract class MixinGuiChat implements net.minecraft.util.ITabCompleter {
@Shadow @Shadow
private TabCompleter tabCompleter; private TabCompleter tabCompleter;

View File

@ -26,6 +26,7 @@ import java.net.URI;
@Mixin(GuiScreen.class) @Mixin(GuiScreen.class)
public abstract class MixinGuiScreen implements IGuiScreen { public abstract class MixinGuiScreen implements IGuiScreen {
@Override @Override
@Invoker("openWebLink") @Invoker("openWebLink")
public abstract void openLink(URI url); public abstract void openLink(URI url);

View File

@ -30,6 +30,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ItemStack.class) @Mixin(ItemStack.class)
public abstract class MixinItemStack implements IItemStack { public abstract class MixinItemStack implements IItemStack {
@Shadow @Shadow
@Final @Final
private Item item; private Item item;

View File

@ -26,6 +26,7 @@ import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(PlayerControllerMP.class) @Mixin(PlayerControllerMP.class)
public abstract class MixinPlayerControllerMP implements IPlayerControllerMP { public abstract class MixinPlayerControllerMP implements IPlayerControllerMP {
@Accessor @Accessor
@Override @Override
public abstract void setIsHittingBlock(boolean isHittingBlock); public abstract void setIsHittingBlock(boolean isHittingBlock);

View File

@ -26,6 +26,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(targets = "net.minecraft.block.state.BlockStateContainer$StateImplementation") @Mixin(targets = "net.minecraft.block.state.BlockStateContainer$StateImplementation")
public abstract class MixinStateImplementation { public abstract class MixinStateImplementation {
@Shadow @Shadow
@Final @Final
private ImmutableMap<IProperty<?>, Comparable<?>> properties; private ImmutableMap<IProperty<?>, Comparable<?>> properties;

View File

@ -35,6 +35,7 @@ import static java.util.Objects.isNull;
@Mixin(TabCompleter.class) @Mixin(TabCompleter.class)
public abstract class MixinTabCompleter implements ITabCompleter { public abstract class MixinTabCompleter implements ITabCompleter {
@Shadow @Shadow
@Final @Final
protected GuiTextField textField; protected GuiTextField textField;

View File

@ -35,6 +35,7 @@ import java.util.Random;
import java.util.function.Predicate; import java.util.function.Predicate;
public final class InventoryBehavior extends Behavior { public final class InventoryBehavior extends Behavior {
public InventoryBehavior(Baritone baritone) { public InventoryBehavior(Baritone baritone) {
super(baritone); super(baritone);
} }

View File

@ -255,6 +255,7 @@ public final class MemoryBehavior extends Behavior {
} }
public static class EnderChestMemory { public static class EnderChestMemory {
private static final Map<Path, EnderChestMemory> memory = new HashMap<>(); private static final Map<Path, EnderChestMemory> memory = new HashMap<>();
private final Path enderChest; private final Path enderChest;
private List<ItemStack> contents; private List<ItemStack> contents;

View File

@ -288,6 +288,7 @@ public final class CachedWorld implements ICachedWorld, Helper {
} }
private class PackerThread implements Runnable { private class PackerThread implements Runnable {
public void run() { public void run() {
while (true) { while (true) {
// TODO: Add CachedWorld unloading to remove the redundancy of having this // TODO: Add CachedWorld unloading to remove the redundancy of having this

View File

@ -26,6 +26,7 @@ import baritone.utils.pathing.PathBase;
import java.util.*; import java.util.*;
public class SplicedPath extends PathBase { public class SplicedPath extends PathBase {
private final List<BetterBlockPos> path; private final List<BetterBlockPos> path;
private final List<IMovement> movements; private final List<IMovement> movements;

View File

@ -58,6 +58,7 @@ import java.util.*;
import static baritone.api.pathing.movement.ActionCosts.COST_INF; import static baritone.api.pathing.movement.ActionCosts.COST_INF;
public final class BuilderProcess extends BaritoneProcessHelper implements IBuilderProcess { public final class BuilderProcess extends BaritoneProcessHelper implements IBuilderProcess {
private HashSet<BetterBlockPos> incorrectPositions; private HashSet<BetterBlockPos> incorrectPositions;
private LongOpenHashSet observedCompleted; // positions that are completed even if they're out of render distance and we can't make sure right now private LongOpenHashSet observedCompleted; // positions that are completed even if they're out of render distance and we can't make sure right now
private String name; private String name;
@ -207,6 +208,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
} }
public static class Placement { public static class Placement {
private final int hotbarSelection; private final int hotbarSelection;
private final BlockPos placeAgainst; private final BlockPos placeAgainst;
private final EnumFacing side; private final EnumFacing side;
@ -603,6 +605,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
} }
public static class JankyGoalComposite implements Goal { public static class JankyGoalComposite implements Goal {
private final Goal primary; private final Goal primary;
private final Goal fallback; private final Goal fallback;
@ -676,6 +679,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
} }
public static class GoalAdjacent extends GoalGetToBlock { public static class GoalAdjacent extends GoalGetToBlock {
private boolean allowSameLevel; private boolean allowSameLevel;
private BlockPos no; private BlockPos no;
@ -708,6 +712,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
} }
public static class GoalPlace extends GoalBlock { public static class GoalPlace extends GoalBlock {
public GoalPlace(BlockPos placeAt) { public GoalPlace(BlockPos placeAt) {
super(placeAt.up()); super(placeAt.up());
} }
@ -758,6 +763,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
} }
public class BuilderCalculationContext extends CalculationContext { public class BuilderCalculationContext extends CalculationContext {
private final List<IBlockState> placeable; private final List<IBlockState> placeable;
private final ISchematic schematic; private final ISchematic schematic;
private final int originX; private final int originX;

View File

@ -173,6 +173,7 @@ public final class ExploreProcess extends BaritoneProcessHelper implements IExpl
} }
private interface IChunkFilter { private interface IChunkFilter {
Status isAlreadyExplored(int chunkX, int chunkZ); Status isAlreadyExplored(int chunkX, int chunkZ);
int countRemain(); int countRemain();
@ -205,6 +206,7 @@ public final class ExploreProcess extends BaritoneProcessHelper implements IExpl
} }
private class JsonChunkFilter implements IChunkFilter { private class JsonChunkFilter implements IChunkFilter {
private final boolean invert; // if true, the list is interpreted as a list of chunks that are NOT explored, if false, the list is interpreted as a list of chunks that ARE explored private final boolean invert; // if true, the list is interpreted as a list of chunks that are NOT explored, if false, the list is interpreted as a list of chunks that ARE explored
private final LongOpenHashSet inFilter; private final LongOpenHashSet inFilter;
private final MyChunkPos[] positions; private final MyChunkPos[] positions;
@ -257,6 +259,7 @@ public final class ExploreProcess extends BaritoneProcessHelper implements IExpl
} }
private class EitherChunk implements IChunkFilter { private class EitherChunk implements IChunkFilter {
private final IChunkFilter a; private final IChunkFilter a;
private final IChunkFilter b; private final IChunkFilter b;

View File

@ -52,6 +52,7 @@ import static baritone.api.pathing.movement.ActionCosts.COST_INF;
* @author leijurv * @author leijurv
*/ */
public final class MineProcess extends BaritoneProcessHelper implements IMineProcess { public final class MineProcess extends BaritoneProcessHelper implements IMineProcess {
private static final int ORE_LOCATIONS_COUNT = 64; private static final int ORE_LOCATIONS_COUNT = 64;
private BlockOptionalMetaLookup filter; private BlockOptionalMetaLookup filter;

View File

@ -7,6 +7,7 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.Vec3i; import net.minecraft.util.math.Vec3i;
public class Selection implements ISelection { public class Selection implements ISelection {
private final BetterBlockPos pos1; private final BetterBlockPos pos1;
private final BetterBlockPos pos2; private final BetterBlockPos pos2;
private final BetterBlockPos min; private final BetterBlockPos min;

View File

@ -10,6 +10,7 @@ import java.util.LinkedList;
import java.util.ListIterator; import java.util.ListIterator;
public class SelectionManager implements ISelectionManager { public class SelectionManager implements ISelectionManager {
private final LinkedList<ISelection> selections = new LinkedList<>(); private final LinkedList<ISelection> selections = new LinkedList<>();
private ISelection[] selectionsArr = new ISelection[0]; private ISelection[] selectionsArr = new ISelection[0];

View File

@ -8,6 +8,7 @@ import baritone.utils.IRenderer;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
public class SelectionRenderer implements IRenderer, AbstractGameEventListener { public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
public static final double SELECTION_BOX_EXPANSION = .005D; public static final double SELECTION_BOX_EXPANSION = .005D;
private final SelectionManager manager; private final SelectionManager manager;

View File

@ -25,6 +25,7 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult;
public class BlockPlaceHelper implements Helper { public class BlockPlaceHelper implements Helper {
private final IPlayerContext ctx; private final IPlayerContext ctx;
private int rightClickTimer; private int rightClickTimer;

View File

@ -32,6 +32,7 @@ import java.awt.*;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
public interface IRenderer { public interface IRenderer {
Tessellator tessellator = Tessellator.getInstance(); Tessellator tessellator = Tessellator.getInstance();
BufferBuilder buffer = tessellator.getBuffer(); BufferBuilder buffer = tessellator.getBuffer();
RenderManager renderManager = Helper.mc.getRenderManager(); RenderManager renderManager = Helper.mc.getRenderManager();

View File

@ -48,6 +48,7 @@ import static org.lwjgl.opengl.GL11.*;
* @since 8/9/2018 * @since 8/9/2018
*/ */
public final class PathRenderer implements IRenderer { public final class PathRenderer implements IRenderer {
private PathRenderer() {} private PathRenderer() {}
public static void render(RenderEvent event, PathingBehavior behavior) { public static void render(RenderEvent event, PathingBehavior behavior) {

View File

@ -23,6 +23,7 @@ import baritone.api.process.PathingCommandType;
import baritone.pathing.movement.CalculationContext; import baritone.pathing.movement.CalculationContext;
public class PathingCommandContext extends PathingCommand { public class PathingCommandContext extends PathingCommand {
public final CalculationContext desiredCalcContext; public final CalculationContext desiredCalcContext;
public PathingCommandContext(Goal goal, PathingCommandType commandType, CalculationContext context) { public PathingCommandContext(Goal goal, PathingCommandType commandType, CalculationContext context) {

View File

@ -32,6 +32,7 @@ import net.minecraft.util.math.BlockPos;
import java.util.*; import java.util.*;
public class PathingControlManager implements IPathingControlManager { public class PathingControlManager implements IPathingControlManager {
private final Baritone baritone; private final Baritone baritone;
private final HashSet<IBaritoneProcess> processes; // unGh private final HashSet<IBaritoneProcess> processes; // unGh
private final List<IBaritoneProcess> active; private final List<IBaritoneProcess> active;

View File

@ -21,6 +21,7 @@ import baritone.api.utils.input.Input;
import net.minecraft.util.MovementInput; import net.minecraft.util.MovementInput;
public class PlayerMovementInput extends MovementInput { public class PlayerMovementInput extends MovementInput {
private final InputOverrideHandler handler; private final InputOverrideHandler handler;
PlayerMovementInput(InputOverrideHandler handler) { PlayerMovementInput(InputOverrideHandler handler) {

View File

@ -38,6 +38,7 @@ import java.util.function.Function;
* @author Avery, Brady, leijurv * @author Avery, Brady, leijurv
*/ */
public class ToolSet { public class ToolSet {
/** /**
* A cache mapping a {@link Block} to how long it will take to break * A cache mapping a {@link Block} to how long it will take to break
* with this toolset, given the optimum tool is used. * with this toolset, given the optimum tool is used.

View File

@ -1,6 +1,7 @@
package baritone.utils.accessor; package baritone.utils.accessor;
public interface IBitArray { public interface IBitArray {
int getAtFast(int index); int getAtFast(int index);
int[] toArray(); int[] toArray();

View File

@ -5,6 +5,7 @@ import net.minecraft.util.BitArray;
import net.minecraft.world.chunk.IBlockStatePalette; import net.minecraft.world.chunk.IBlockStatePalette;
public interface IBlockStateContainer { public interface IBlockStateContainer {
IBlockStatePalette getPalette(); IBlockStatePalette getPalette();
BitArray getStorage(); BitArray getStorage();

View File

@ -21,5 +21,6 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.Chunk;
public interface IChunkProviderClient { public interface IChunkProviderClient {
Long2ObjectMap<Chunk> loadedChunks(); Long2ObjectMap<Chunk> loadedChunks();
} }

View File

@ -20,6 +20,7 @@ package baritone.utils.accessor;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
public interface IPlayerControllerMP { public interface IPlayerControllerMP {
void setIsHittingBlock(boolean isHittingBlock); void setIsHittingBlock(boolean isHittingBlock);
BlockPos getCurrentBlock(); BlockPos getCurrentBlock();

View File

@ -1,6 +1,7 @@
package baritone.utils.accessor; package baritone.utils.accessor;
public interface ITabCompleter { public interface ITabCompleter {
String getPrefix(); String getPrefix();
void setPrefix(String prefix); void setPrefix(String prefix);

View File

@ -30,6 +30,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class AxisCommand extends Command { public class AxisCommand extends Command {
public AxisCommand(IBaritone baritone) { public AxisCommand(IBaritone baritone) {
super(baritone, asList("axis", "highway")); super(baritone, asList("axis", "highway"));
} }

View File

@ -30,6 +30,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class BlacklistCommand extends Command { public class BlacklistCommand extends Command {
public BlacklistCommand(IBaritone baritone) { public BlacklistCommand(IBaritone baritone) {
super(baritone, "blacklist"); super(baritone, "blacklist");
} }

View File

@ -35,6 +35,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class BuildCommand extends Command { public class BuildCommand extends Command {
private static final File schematicsDir = new File(Minecraft.getMinecraft().gameDir, "schematics"); private static final File schematicsDir = new File(Minecraft.getMinecraft().gameDir, "schematics");
public BuildCommand(IBaritone baritone) { public BuildCommand(IBaritone baritone) {

View File

@ -28,6 +28,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class CancelCommand extends Command { public class CancelCommand extends Command {
public CancelCommand(IBaritone baritone) { public CancelCommand(IBaritone baritone) {
super(baritone, asList("cancel", "stop")); super(baritone, asList("cancel", "stop"));
} }

View File

@ -36,6 +36,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class ChestsCommand extends Command { public class ChestsCommand extends Command {
public ChestsCommand(IBaritone baritone) { public ChestsCommand(IBaritone baritone) {
super(baritone, "chests"); super(baritone, "chests");
} }

View File

@ -33,6 +33,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class ClearareaCommand extends Command { public class ClearareaCommand extends Command {
public ClearareaCommand(IBaritone baritone) { public ClearareaCommand(IBaritone baritone) {
super(baritone, "cleararea"); super(baritone, "cleararea");
} }

View File

@ -28,6 +28,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class ClickCommand extends Command { public class ClickCommand extends Command {
public ClickCommand(IBaritone baritone) { public ClickCommand(IBaritone baritone) {
super(baritone, "click"); super(baritone, "click");
} }

View File

@ -33,6 +33,7 @@ import static java.util.Arrays.asList;
import static java.util.Objects.isNull; import static java.util.Objects.isNull;
public class ComeCommand extends Command { public class ComeCommand extends Command {
public ComeCommand(IBaritone baritone) { public ComeCommand(IBaritone baritone) {
super(baritone, "come"); super(baritone, "come");
} }

View File

@ -28,6 +28,7 @@ import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
public class CommandAlias extends Command { public class CommandAlias extends Command {
private final String shortDesc; private final String shortDesc;
public final String target; public final String target;

View File

@ -25,6 +25,7 @@ import java.util.*;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class DefaultCommands { public class DefaultCommands {
public static List<Command> commands(IBaritone baritone) { public static List<Command> commands(IBaritone baritone) {
Objects.requireNonNull(baritone); Objects.requireNonNull(baritone);
List<Command> commands = new ArrayList<>(); List<Command> commands = new ArrayList<>();

View File

@ -28,6 +28,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class EmptyCommand extends Command { public class EmptyCommand extends Command {
public EmptyCommand(IBaritone baritone) { public EmptyCommand(IBaritone baritone) {
super(baritone, asList("name1", "name2")); super(baritone, asList("name1", "name2"));
} }

View File

@ -30,6 +30,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class ExploreCommand extends Command { public class ExploreCommand extends Command {
public ExploreCommand(IBaritone baritone) { public ExploreCommand(IBaritone baritone) {
super(baritone, "explore"); super(baritone, "explore");
} }

View File

@ -28,6 +28,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class FarmCommand extends Command { public class FarmCommand extends Command {
public FarmCommand(IBaritone baritone) { public FarmCommand(IBaritone baritone) {
super(baritone, "farm"); super(baritone, "farm");
} }

View File

@ -32,6 +32,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class FindCommand extends Command { public class FindCommand extends Command {
public FindCommand(IBaritone baritone) { public FindCommand(IBaritone baritone) {
super(baritone, "find"); super(baritone, "find");
} }

View File

@ -44,6 +44,7 @@ import static java.util.Objects.isNull;
import static java.util.Objects.nonNull; import static java.util.Objects.nonNull;
public class FollowCommand extends Command { public class FollowCommand extends Command {
public FollowCommand(IBaritone baritone) { public FollowCommand(IBaritone baritone) {
super(baritone, "follow"); super(baritone, "follow");
} }

View File

@ -29,6 +29,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class ForceCancelCommand extends Command { public class ForceCancelCommand extends Command {
public ForceCancelCommand(IBaritone baritone) { public ForceCancelCommand(IBaritone baritone) {
super(baritone, "forcecancel"); super(baritone, "forcecancel");
} }

View File

@ -28,6 +28,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class GcCommand extends Command { public class GcCommand extends Command {
public GcCommand(IBaritone baritone) { public GcCommand(IBaritone baritone) {
super(baritone, "gc"); super(baritone, "gc");
} }

View File

@ -36,6 +36,7 @@ import static java.util.Objects.isNull;
import static java.util.Objects.nonNull; import static java.util.Objects.nonNull;
public class GoalCommand extends Command { public class GoalCommand extends Command {
public GoalCommand(IBaritone baritone) { public GoalCommand(IBaritone baritone) {
super(baritone, "goal"); super(baritone, "goal");
} }

View File

@ -41,6 +41,7 @@ import static java.util.Arrays.asList;
import static java.util.Objects.isNull; import static java.util.Objects.isNull;
public class HelpCommand extends Command { public class HelpCommand extends Command {
public HelpCommand(IBaritone baritone) { public HelpCommand(IBaritone baritone) {
super(baritone, asList("help", "?")); super(baritone, asList("help", "?"));
} }

View File

@ -33,6 +33,7 @@ import static java.util.Arrays.asList;
import static java.util.Objects.isNull; import static java.util.Objects.isNull;
public class InvertCommand extends Command { public class InvertCommand extends Command {
public InvertCommand(IBaritone baritone) { public InvertCommand(IBaritone baritone) {
super(baritone, "invert"); super(baritone, "invert");
} }

View File

@ -33,6 +33,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class MineCommand extends Command { public class MineCommand extends Command {
public MineCommand(IBaritone baritone) { public MineCommand(IBaritone baritone) {
super(baritone, "mine"); super(baritone, "mine");
} }

View File

@ -36,6 +36,7 @@ import static java.util.Arrays.asList;
import static java.util.Objects.isNull; import static java.util.Objects.isNull;
public class PathCommand extends Command { public class PathCommand extends Command {
public PathCommand(IBaritone baritone) { public PathCommand(IBaritone baritone) {
super(baritone, asList("path", "goto")); super(baritone, asList("path", "goto"));
} }

View File

@ -39,6 +39,7 @@ import static java.util.Arrays.asList;
* REQUEST_PAUSE} as needed. * REQUEST_PAUSE} as needed.
*/ */
public class PauseResumeCommands { public class PauseResumeCommands {
private final IBaritone baritone; private final IBaritone baritone;
Command pauseCommand; Command pauseCommand;
Command resumeCommand; Command resumeCommand;

View File

@ -33,6 +33,7 @@ import static java.util.Arrays.asList;
import static java.util.Objects.isNull; import static java.util.Objects.isNull;
public class ProcCommand extends Command { public class ProcCommand extends Command {
public ProcCommand(IBaritone baritone) { public ProcCommand(IBaritone baritone) {
super(baritone, "proc"); super(baritone, "proc");
} }

View File

@ -28,6 +28,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class ReloadAllCommand extends Command { public class ReloadAllCommand extends Command {
public ReloadAllCommand(IBaritone baritone) { public ReloadAllCommand(IBaritone baritone) {
super(baritone, "reloadall"); super(baritone, "reloadall");
} }

View File

@ -29,6 +29,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class RenderCommand extends Command { public class RenderCommand extends Command {
public RenderCommand(IBaritone baritone) { public RenderCommand(IBaritone baritone) {
super(baritone, "render"); super(baritone, "render");
} }

View File

@ -29,6 +29,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class RepackCommand extends Command { public class RepackCommand extends Command {
public RepackCommand(IBaritone baritone) { public RepackCommand(IBaritone baritone) {
super(baritone, asList("repack", "rescan")); super(baritone, asList("repack", "rescan"));
} }

View File

@ -28,6 +28,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class SaveAllCommand extends Command { public class SaveAllCommand extends Command {
public SaveAllCommand(IBaritone baritone) { public SaveAllCommand(IBaritone baritone) {
super(baritone, "saveall"); super(baritone, "saveall");
} }

View File

@ -28,6 +28,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class SchematicaCommand extends Command { public class SchematicaCommand extends Command {
public SchematicaCommand(IBaritone baritone) { public SchematicaCommand(IBaritone baritone) {
super(baritone, "schematica"); super(baritone, "schematica");
} }

View File

@ -54,6 +54,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class SelCommand extends Command { public class SelCommand extends Command {
private ISelectionManager manager = baritone.getSelectionManager(); private ISelectionManager manager = baritone.getSelectionManager();
private BetterBlockPos pos1 = null; private BetterBlockPos pos1 = null;

View File

@ -45,6 +45,7 @@ import static java.util.Objects.nonNull;
import static java.util.stream.Stream.of; import static java.util.stream.Stream.of;
public class SetCommand extends Command { public class SetCommand extends Command {
public SetCommand(IBaritone baritone) { public SetCommand(IBaritone baritone) {
super(baritone, asList("set", "setting", "settings")); super(baritone, asList("set", "setting", "settings"));
} }

View File

@ -29,6 +29,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class ThisWayCommand extends Command { public class ThisWayCommand extends Command {
public ThisWayCommand(IBaritone baritone) { public ThisWayCommand(IBaritone baritone) {
super(baritone, asList("thisway", "forward")); super(baritone, asList("thisway", "forward"));
} }

View File

@ -30,6 +30,7 @@ import java.util.stream.Stream;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class TunnelCommand extends Command { public class TunnelCommand extends Command {
public TunnelCommand(IBaritone baritone) { public TunnelCommand(IBaritone baritone) {
super(baritone, "tunnel"); super(baritone, "tunnel");
} }

View File

@ -30,6 +30,7 @@ import static java.util.Arrays.asList;
import static java.util.Objects.isNull; import static java.util.Objects.isNull;
public class VersionCommand extends Command { public class VersionCommand extends Command {
public VersionCommand(IBaritone baritone) { public VersionCommand(IBaritone baritone) {
super(baritone, "version"); super(baritone, "version");
} }

View File

@ -50,6 +50,7 @@ import static baritone.api.utils.command.BaritoneChatControl.FORCE_COMMAND_PREFI
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
public class WaypointsCommand extends Command { public class WaypointsCommand extends Command {
public WaypointsCommand(IBaritone baritone) { public WaypointsCommand(IBaritone baritone) {
super(baritone, asList("waypoints", "waypoint", "wp")); super(baritone, asList("waypoints", "waypoint", "wp"));
} }

View File

@ -32,6 +32,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
public class Avoidance { public class Avoidance {
private final int centerX; private final int centerX;
private final int centerY; private final int centerY;
private final int centerZ; private final int centerZ;

View File

@ -25,6 +25,7 @@ import baritone.pathing.movement.CalculationContext;
import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap;
public final class Favoring { public final class Favoring {
private final Long2DoubleOpenHashMap favorings; private final Long2DoubleOpenHashMap favorings;
public Favoring(IPlayerContext ctx, IPath previous, CalculationContext context) { public Favoring(IPlayerContext ctx, IPath previous, CalculationContext context) {

View File

@ -25,6 +25,7 @@ import baritone.api.pathing.movement.ActionCosts;
* @author leijurv * @author leijurv
*/ */
public final class MutableMoveResult { public final class MutableMoveResult {
public int x; public int x;
public int y; public int y;
public int z; public int z;

View File

@ -26,6 +26,7 @@ import baritone.utils.BlockStateInterface;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
public abstract class PathBase implements IPath { public abstract class PathBase implements IPath {
@Override @Override
public PathBase cutoffAtLoadedChunks(Object bsi0) { // <-- cursed cursed cursed public PathBase cutoffAtLoadedChunks(Object bsi0) { // <-- cursed cursed cursed
if (!Baritone.settings().cutoffAtLoadBoundary.value) { if (!Baritone.settings().cutoffAtLoadBoundary.value) {

View File

@ -23,6 +23,7 @@ import net.minecraft.block.state.IBlockState;
import java.util.List; import java.util.List;
public class FillSchematic implements ISchematic { public class FillSchematic implements ISchematic {
private final int widthX; private final int widthX;
private final int heightY; private final int heightY;
private final int lengthZ; private final int lengthZ;

View File

@ -25,6 +25,7 @@ import net.minecraft.nbt.NBTTagCompound;
import java.util.List; import java.util.List;
public class Schematic implements ISchematic { public class Schematic implements ISchematic {
public final int widthX; public final int widthX;
public final int heightY; public final int heightY;
public final int lengthZ; public final int lengthZ;

View File

@ -23,6 +23,7 @@ import static baritone.api.pathing.movement.ActionCosts.*;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class ActionCostsTest { public class ActionCostsTest {
@Test @Test
public void testFallNBlocksCost() { public void testFallNBlocksCost() {
assertEquals(FALL_N_BLOCKS_COST.length, 257); // Fall 0 blocks through fall 256 blocks assertEquals(FALL_N_BLOCKS_COST.length, 257); // Fall 0 blocks through fall 256 blocks

Some files were not shown because too many files have changed in this diff Show More