standardize on this

This commit is contained in:
Leijurv
2019-09-19 13:40:46 -07:00
parent 23a592ec01
commit 0a38e6f690
101 changed files with 110 additions and 0 deletions

View File

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

View File

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

View File

@@ -288,6 +288,7 @@ public final class CachedWorld implements ICachedWorld, Helper {
}
private class PackerThread implements Runnable {
public void run() {
while (true) {
// 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.*;
public class SplicedPath extends PathBase {
private final List<BetterBlockPos> path;
private final List<IMovement> movements;

View File

@@ -58,6 +58,7 @@ import java.util.*;
import static baritone.api.pathing.movement.ActionCosts.COST_INF;
public final class BuilderProcess extends BaritoneProcessHelper implements IBuilderProcess {
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 String name;
@@ -207,6 +208,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
}
public static class Placement {
private final int hotbarSelection;
private final BlockPos placeAgainst;
private final EnumFacing side;
@@ -603,6 +605,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
}
public static class JankyGoalComposite implements Goal {
private final Goal primary;
private final Goal fallback;
@@ -676,6 +679,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
}
public static class GoalAdjacent extends GoalGetToBlock {
private boolean allowSameLevel;
private BlockPos no;
@@ -708,6 +712,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
}
public static class GoalPlace extends GoalBlock {
public GoalPlace(BlockPos placeAt) {
super(placeAt.up());
}
@@ -758,6 +763,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
}
public class BuilderCalculationContext extends CalculationContext {
private final List<IBlockState> placeable;
private final ISchematic schematic;
private final int originX;

View File

@@ -173,6 +173,7 @@ public final class ExploreProcess extends BaritoneProcessHelper implements IExpl
}
private interface IChunkFilter {
Status isAlreadyExplored(int chunkX, int chunkZ);
int countRemain();
@@ -205,6 +206,7 @@ public final class ExploreProcess extends BaritoneProcessHelper implements IExpl
}
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 LongOpenHashSet inFilter;
private final MyChunkPos[] positions;
@@ -257,6 +259,7 @@ public final class ExploreProcess extends BaritoneProcessHelper implements IExpl
}
private class EitherChunk implements IChunkFilter {
private final IChunkFilter a;
private final IChunkFilter b;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -30,6 +30,7 @@ import static java.util.Arrays.asList;
import static java.util.Objects.isNull;
public class VersionCommand extends Command {
public VersionCommand(IBaritone baritone) {
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;
public class WaypointsCommand extends Command {
public WaypointsCommand(IBaritone baritone) {
super(baritone, asList("waypoints", "waypoint", "wp"));
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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