robotics package cleanup
This commit is contained in:
parent
7c0a2ebbb5
commit
0945972f60
37 changed files with 36 additions and 64 deletions
|
@ -25,7 +25,7 @@ public class AIRobotAttack extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotAttack(EntityRobotBase iRobot, Entity iTarget) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
target = iTarget;
|
||||
}
|
||||
|
@ -77,7 +77,7 @@ public class AIRobotAttack extends AIRobot {
|
|||
if (ai instanceof AIRobotGotoBlock) {
|
||||
AIRobotGotoBlock aiGoto = (AIRobotGotoBlock) ai;
|
||||
|
||||
if (((AIRobotGotoBlock) ai).unreachable) {
|
||||
if (aiGoto.unreachable) {
|
||||
robot.unreachableEntityDetected(target);
|
||||
}
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ public class AIRobotBreak extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotBreak(EntityRobotBase iRobot, BlockIndex iBlockToBreak) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
blockToBreak = iBlockToBreak;
|
||||
}
|
||||
|
|
|
@ -51,7 +51,7 @@ public class AIRobotCraftAssemblyTable extends AIRobotCraftGeneric {
|
|||
}
|
||||
|
||||
public AIRobotCraftAssemblyTable(EntityRobotBase iRobot, CraftingResult craftingResult) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
expectedResult = craftingResult;
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ public class AIRobotCraftFurnace extends AIRobotCraftGeneric {
|
|||
}
|
||||
|
||||
public AIRobotCraftFurnace(EntityRobotBase iRobot, ItemStack iInput, ItemStack iOutput) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
input = iInput;
|
||||
expectedOutput = iOutput;
|
||||
|
|
|
@ -49,7 +49,7 @@ public class AIRobotCraftWorkbench extends AIRobotCraftGeneric {
|
|||
}
|
||||
|
||||
public AIRobotCraftWorkbench(EntityRobotBase iRobot, IRecipe iRecipe) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
recipe = iRecipe;
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ public class AIRobotDeliverRequested extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotDeliverRequested(EntityRobotBase robot, StackRequest request) {
|
||||
super(robot);
|
||||
this(robot);
|
||||
|
||||
requested = request;
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ public class AIRobotFetchAndEquipItemStack extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotFetchAndEquipItemStack(EntityRobotBase iRobot, IStackFilter iFilter) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
filter = new AggregateFilter(ActionRobotFilterTool.getGateFilter(iRobot.getLinkedStation()), iFilter);
|
||||
}
|
||||
|
|
|
@ -28,14 +28,12 @@ public class AIRobotFetchItem extends AIRobot {
|
|||
private int pickTime = -1;
|
||||
private IZone zone;
|
||||
|
||||
private int targetToLoad = -1;
|
||||
|
||||
public AIRobotFetchItem(EntityRobotBase iRobot) {
|
||||
super(iRobot);
|
||||
}
|
||||
|
||||
public AIRobotFetchItem(EntityRobotBase iRobot, float iMaxRange, IStackFilter iStackFilter, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
maxRange = iMaxRange;
|
||||
stackFilter = iStackFilter;
|
||||
|
|
|
@ -21,7 +21,7 @@ public class AIRobotGoAndLinkToDock extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGoAndLinkToDock(EntityRobotBase iRobot, DockingStation iStation) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
station = iStation;
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ public class AIRobotGotoBlock extends AIRobotGoto {
|
|||
}
|
||||
|
||||
public AIRobotGotoBlock(EntityRobotBase robot, int x, int y, int z) {
|
||||
super(robot);
|
||||
this(robot);
|
||||
finalX = x;
|
||||
finalY = y;
|
||||
finalZ = z;
|
||||
|
|
|
@ -26,7 +26,7 @@ public class AIRobotGotoStation extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGotoStation(EntityRobotBase iRobot, DockingStation station) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
stationIndex = station.index();
|
||||
stationSide = station.side();
|
||||
|
|
|
@ -24,7 +24,7 @@ public class AIRobotGotoStationAndLoad extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGotoStationAndLoad(EntityRobotBase iRobot, IStackFilter iFilter, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
filter = iFilter;
|
||||
zone = iZone;
|
||||
|
|
|
@ -24,7 +24,7 @@ public class AIRobotGotoStationAndLoadFluids extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGotoStationAndLoadFluids(EntityRobotBase iRobot, IFluidFilter iFilter, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
zone = iZone;
|
||||
filter = iFilter;
|
||||
|
|
|
@ -24,7 +24,7 @@ public class AIRobotGotoStationAndUnload extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGotoStationAndUnload(EntityRobotBase iRobot, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
zone = iZone;
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ public class AIRobotGotoStationAndUnloadFluids extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGotoStationAndUnloadFluids(EntityRobotBase iRobot, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
zone = iZone;
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ public class AIRobotGotoStationToLoad extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGotoStationToLoad(EntityRobotBase iRobot, IStackFilter iFilter, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
filter = iFilter;
|
||||
zone = iZone;
|
||||
|
|
|
@ -32,7 +32,7 @@ public class AIRobotGotoStationToLoadFluids extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGotoStationToLoadFluids(EntityRobotBase iRobot, IFluidFilter iFiler, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
zone = iZone;
|
||||
filter = iFiler;
|
||||
|
|
|
@ -32,7 +32,7 @@ public class AIRobotGotoStationToUnload extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGotoStationToUnload(EntityRobotBase iRobot, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
zone = iZone;
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ public class AIRobotGotoStationToUnloadFluids extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotGotoStationToUnloadFluids(EntityRobotBase iRobot, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
zone = iZone;
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ public class AIRobotLoad extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotLoad(EntityRobotBase iRobot, IStackFilter iFilter) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
filter = iFilter;
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ public class AIRobotLoadFluids extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotLoadFluids(EntityRobotBase iRobot, IFluidFilter iFilter) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
filter = iFilter;
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@ public class AIRobotPumpBlock extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotPumpBlock(EntityRobotBase iRobot, BlockIndex iBlockToPump) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
blockToPump = iBlockToPump;
|
||||
}
|
||||
|
|
|
@ -16,8 +16,6 @@ import buildcraft.robotics.IStationFilter;
|
|||
|
||||
public class AIRobotRecharge extends AIRobot {
|
||||
|
||||
private DockingStation axeDocking = null;
|
||||
|
||||
public AIRobotRecharge(EntityRobotBase iRobot) {
|
||||
super(iRobot);
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ public class AIRobotSearchAndGotoStation extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotSearchAndGotoStation(EntityRobotBase iRobot, IStationFilter iFilter, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
filter = iFilter;
|
||||
zone = iZone;
|
||||
|
|
|
@ -12,7 +12,6 @@ import net.minecraft.entity.Entity;
|
|||
import buildcraft.api.core.IZone;
|
||||
import buildcraft.api.robots.AIRobot;
|
||||
import buildcraft.api.robots.EntityRobotBase;
|
||||
import buildcraft.core.lib.inventory.TransactorSimple;
|
||||
import buildcraft.core.lib.utils.IEntityFilter;
|
||||
|
||||
public class AIRobotSearchEntity extends AIRobot {
|
||||
|
@ -28,7 +27,7 @@ public class AIRobotSearchEntity extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotSearchEntity(EntityRobotBase iRobot, IEntityFilter iFilter, float iMaxRange, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
maxRange = iMaxRange;
|
||||
zone = iZone;
|
||||
|
@ -38,7 +37,6 @@ public class AIRobotSearchEntity extends AIRobot {
|
|||
@Override
|
||||
public void start() {
|
||||
double previousDistance = Double.MAX_VALUE;
|
||||
TransactorSimple inventoryInsert = new TransactorSimple(robot);
|
||||
|
||||
for (Object o : robot.worldObj.loadedEntityList) {
|
||||
Entity e = (Entity) o;
|
||||
|
|
|
@ -26,8 +26,12 @@ public class AIRobotSearchRandomGroundBlock extends AIRobot {
|
|||
private IZone zone;
|
||||
private int attempts = 0;
|
||||
|
||||
public AIRobotSearchRandomGroundBlock(EntityRobotBase iRobot, int iRange, IBlockFilter iFilter, IZone iZone) {
|
||||
public AIRobotSearchRandomGroundBlock(EntityRobotBase iRobot) {
|
||||
super(iRobot);
|
||||
}
|
||||
|
||||
public AIRobotSearchRandomGroundBlock(EntityRobotBase iRobot, int iRange, IBlockFilter iFilter, IZone iZone) {
|
||||
this(iRobot);
|
||||
|
||||
range = iRange;
|
||||
filter = iFilter;
|
||||
|
|
|
@ -42,7 +42,7 @@ public class AIRobotSearchStackRequest extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotSearchStackRequest(EntityRobotBase iRobot, IStackFilter iFilter, Collection<ItemStack> iBlackList) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
blackList = iBlackList;
|
||||
filter = iFilter;
|
||||
|
|
|
@ -26,7 +26,7 @@ public class AIRobotSearchStation extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotSearchStation(EntityRobotBase iRobot, IStationFilter iFilter, IZone iZone) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
filter = iFilter;
|
||||
zone = iZone;
|
||||
|
|
|
@ -21,8 +21,7 @@ public class AIRobotStraightMoveTo extends AIRobotGoto {
|
|||
}
|
||||
|
||||
public AIRobotStraightMoveTo(EntityRobotBase iRobot, float ix, float iy, float iz) {
|
||||
super(iRobot);
|
||||
robot = iRobot;
|
||||
this(iRobot);
|
||||
x = ix;
|
||||
y = iy;
|
||||
z = iz;
|
||||
|
|
|
@ -32,7 +32,7 @@ public class AIRobotStripesHandler extends AIRobot implements IStripesActivator
|
|||
}
|
||||
|
||||
public AIRobotStripesHandler(EntityRobotBase iRobot, BlockIndex index) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
useToBlock = index;
|
||||
}
|
||||
|
@ -75,10 +75,6 @@ public class AIRobotStripesHandler extends AIRobot implements IStripesActivator
|
|||
}
|
||||
}
|
||||
|
||||
private ForgeDirection getDirection() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void end() {
|
||||
robot.setItemActive(false);
|
||||
|
|
|
@ -26,7 +26,7 @@ public class AIRobotUseToolOnBlock extends AIRobot {
|
|||
}
|
||||
|
||||
public AIRobotUseToolOnBlock(EntityRobotBase iRobot, BlockIndex index) {
|
||||
super(iRobot);
|
||||
this(iRobot);
|
||||
|
||||
useToBlock = index;
|
||||
}
|
||||
|
|
|
@ -15,7 +15,6 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import buildcraft.api.boards.RedstoneBoardRobot;
|
||||
import buildcraft.api.boards.RedstoneBoardRobotNBT;
|
||||
import buildcraft.api.core.BlockIndex;
|
||||
import buildcraft.api.robots.AIRobot;
|
||||
import buildcraft.api.robots.EntityRobotBase;
|
||||
import buildcraft.core.lib.inventory.ITransactor;
|
||||
|
@ -32,8 +31,6 @@ public class BoardRobotBomber extends RedstoneBoardRobot {
|
|||
|
||||
private static final IStackFilter TNT_FILTER = new ArrayStackFilter(new ItemStack(Blocks.tnt));
|
||||
|
||||
private BlockIndex target = null;
|
||||
|
||||
private int flyingHeight = 20;
|
||||
|
||||
public BoardRobotBomber(EntityRobotBase iRobot) {
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
package buildcraft.robotics.boards;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
|
@ -24,7 +23,6 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT;
|
|||
import buildcraft.api.recipes.CraftingResult;
|
||||
import buildcraft.api.recipes.IFlexibleRecipe;
|
||||
import buildcraft.api.robots.AIRobot;
|
||||
import buildcraft.api.robots.DockingStation;
|
||||
import buildcraft.api.robots.EntityRobotBase;
|
||||
import buildcraft.api.robots.StackRequest;
|
||||
import buildcraft.core.lib.inventory.StackHelper;
|
||||
|
@ -45,7 +43,6 @@ public class BoardRobotCrafter extends RedstoneBoardRobot {
|
|||
|
||||
private ItemStack order;
|
||||
private ArrayList<ItemStack> craftingBlacklist = new ArrayList<ItemStack>();
|
||||
private HashSet<DockingStation> reservedStations = new HashSet<DockingStation>();
|
||||
private StackRequest currentRequest = null;
|
||||
|
||||
public BoardRobotCrafter(EntityRobotBase iRobot) {
|
||||
|
|
|
@ -25,17 +25,10 @@ public class BoardRobotPicker extends RedstoneBoardRobot {
|
|||
// TODO: Clean this when world unloaded
|
||||
public static Set<Integer> targettedItems = new HashSet<Integer>();
|
||||
|
||||
private NBTTagCompound data;
|
||||
|
||||
public BoardRobotPicker(EntityRobotBase iRobot) {
|
||||
super(iRobot);
|
||||
}
|
||||
|
||||
public BoardRobotPicker(EntityRobotBase robot, NBTTagCompound nbt) {
|
||||
super(robot);
|
||||
data = nbt;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update() {
|
||||
startDelegateAI(new AIRobotFetchItem(robot, 250, ActionRobotFilter.getGateFilter(robot
|
||||
|
|
|
@ -44,7 +44,7 @@ public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT {
|
|||
|
||||
@Override
|
||||
public RedstoneBoardRobot create(NBTTagCompound nbt, EntityRobotBase object) {
|
||||
return new BoardRobotPicker(object, nbt);
|
||||
return new BoardRobotPicker(object);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -16,8 +16,6 @@ import buildcraft.api.robots.EntityRobotBase;
|
|||
|
||||
public class BoardRobotShovelman extends BoardRobotGenericBreakBlock {
|
||||
|
||||
private boolean extendedOre = false;
|
||||
|
||||
public BoardRobotShovelman(EntityRobotBase iRobot) {
|
||||
super(iRobot);
|
||||
}
|
||||
|
|
|
@ -117,10 +117,4 @@ public class BoardRobotStripes extends RedstoneBoardRobot {
|
|||
blockFound = new BlockIndex(nbt.getCompoundTag("blockFound"));
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isAirAbove(World world, int x, int y, int z) {
|
||||
synchronized (world) {
|
||||
return world.isAirBlock(x, y + 1, z);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue