Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

robotics package cleanup

Browse source
This commit is contained in:
Hea3veN 2015-04-02 09:58:18 -03:00
parent 7c0a2ebbb5
commit 0945972f60
37 changed files with 36 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/robotics/ai/AIRobotAttack.java
View file

@ -25,7 +25,7 @@ public class AIRobotAttack extends AIRobot {
} }
public AIRobotAttack(EntityRobotBase iRobot, Entity iTarget) { public AIRobotAttack(EntityRobotBase iRobot, Entity iTarget) {
super(iRobot); this(iRobot);
target = iTarget; target = iTarget;
} }
@ -77,7 +77,7 @@ public class AIRobotAttack extends AIRobot {
if (ai instanceof AIRobotGotoBlock) { if (ai instanceof AIRobotGotoBlock) {
AIRobotGotoBlock aiGoto = (AIRobotGotoBlock) ai; AIRobotGotoBlock aiGoto = (AIRobotGotoBlock) ai;
if (((AIRobotGotoBlock) ai).unreachable) { if (aiGoto.unreachable) {
robot.unreachableEntityDetected(target); robot.unreachableEntityDetected(target);
} }

2
common/buildcraft/robotics/ai/AIRobotBreak.java
View file

@ -36,7 +36,7 @@ public class AIRobotBreak extends AIRobot {
} }
public AIRobotBreak(EntityRobotBase iRobot, BlockIndex iBlockToBreak) { public AIRobotBreak(EntityRobotBase iRobot, BlockIndex iBlockToBreak) {
super(iRobot); this(iRobot);
blockToBreak = iBlockToBreak; blockToBreak = iBlockToBreak;
} }

2
common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java
View file

@ -51,7 +51,7 @@ public class AIRobotCraftAssemblyTable extends AIRobotCraftGeneric {
} }
public AIRobotCraftAssemblyTable(EntityRobotBase iRobot, CraftingResult craftingResult) { public AIRobotCraftAssemblyTable(EntityRobotBase iRobot, CraftingResult craftingResult) {
super(iRobot); this(iRobot);
expectedResult = craftingResult; expectedResult = craftingResult;
} }

2
common/buildcraft/robotics/ai/AIRobotCraftFurnace.java
View file

@ -48,7 +48,7 @@ public class AIRobotCraftFurnace extends AIRobotCraftGeneric {
} }
public AIRobotCraftFurnace(EntityRobotBase iRobot, ItemStack iInput, ItemStack iOutput) { public AIRobotCraftFurnace(EntityRobotBase iRobot, ItemStack iInput, ItemStack iOutput) {
super(iRobot); this(iRobot);
input = iInput; input = iInput;
expectedOutput = iOutput; expectedOutput = iOutput;

2
common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java
View file

@ -49,7 +49,7 @@ public class AIRobotCraftWorkbench extends AIRobotCraftGeneric {
} }
public AIRobotCraftWorkbench(EntityRobotBase iRobot, IRecipe iRecipe) { public AIRobotCraftWorkbench(EntityRobotBase iRobot, IRecipe iRecipe) {
super(iRobot); this(iRobot);
recipe = iRecipe; recipe = iRecipe;
} }

2
common/buildcraft/robotics/ai/AIRobotDeliverRequested.java
View file

@ -34,7 +34,7 @@ public class AIRobotDeliverRequested extends AIRobot {
} }
public AIRobotDeliverRequested(EntityRobotBase robot, StackRequest request) { public AIRobotDeliverRequested(EntityRobotBase robot, StackRequest request) {
super(robot); this(robot);
requested = request; requested = request;
} }

2
common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java
View file

@ -30,7 +30,7 @@ public class AIRobotFetchAndEquipItemStack extends AIRobot {
} }
public AIRobotFetchAndEquipItemStack(EntityRobotBase iRobot, IStackFilter iFilter) { public AIRobotFetchAndEquipItemStack(EntityRobotBase iRobot, IStackFilter iFilter) {
super(iRobot); this(iRobot);
filter = new AggregateFilter(ActionRobotFilterTool.getGateFilter(iRobot.getLinkedStation()), iFilter); filter = new AggregateFilter(ActionRobotFilterTool.getGateFilter(iRobot.getLinkedStation()), iFilter);
} }

4
common/buildcraft/robotics/ai/AIRobotFetchItem.java
View file

@ -28,14 +28,12 @@ public class AIRobotFetchItem extends AIRobot {
private int pickTime = -1; private int pickTime = -1;
private IZone zone; private IZone zone;
private int targetToLoad = -1;
public AIRobotFetchItem(EntityRobotBase iRobot) { public AIRobotFetchItem(EntityRobotBase iRobot) {
super(iRobot); super(iRobot);
} }
public AIRobotFetchItem(EntityRobotBase iRobot, float iMaxRange, IStackFilter iStackFilter, IZone iZone) { public AIRobotFetchItem(EntityRobotBase iRobot, float iMaxRange, IStackFilter iStackFilter, IZone iZone) {
super(iRobot); this(iRobot);
maxRange = iMaxRange; maxRange = iMaxRange;
stackFilter = iStackFilter; stackFilter = iStackFilter;

2
common/buildcraft/robotics/ai/AIRobotGoAndLinkToDock.java
View file

@ -21,7 +21,7 @@ public class AIRobotGoAndLinkToDock extends AIRobot {
} }
public AIRobotGoAndLinkToDock(EntityRobotBase iRobot, DockingStation iStation) { public AIRobotGoAndLinkToDock(EntityRobotBase iRobot, DockingStation iStation) {
super(iRobot); this(iRobot);
station = iStation; station = iStation;
} }

2
common/buildcraft/robotics/ai/AIRobotGotoBlock.java
View file

@ -34,7 +34,7 @@ public class AIRobotGotoBlock extends AIRobotGoto {
} }
public AIRobotGotoBlock(EntityRobotBase robot, int x, int y, int z) { public AIRobotGotoBlock(EntityRobotBase robot, int x, int y, int z) {
super(robot); this(robot);
finalX = x; finalX = x;
finalY = y; finalY = y;
finalZ = z; finalZ = z;

2
common/buildcraft/robotics/ai/AIRobotGotoStation.java
View file

@ -26,7 +26,7 @@ public class AIRobotGotoStation extends AIRobot {
} }
public AIRobotGotoStation(EntityRobotBase iRobot, DockingStation station) { public AIRobotGotoStation(EntityRobotBase iRobot, DockingStation station) {
super(iRobot); this(iRobot);
stationIndex = station.index(); stationIndex = station.index();
stationSide = station.side(); stationSide = station.side();

2
common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java
View file

@ -24,7 +24,7 @@ public class AIRobotGotoStationAndLoad extends AIRobot {
} }
public AIRobotGotoStationAndLoad(EntityRobotBase iRobot, IStackFilter iFilter, IZone iZone) { public AIRobotGotoStationAndLoad(EntityRobotBase iRobot, IStackFilter iFilter, IZone iZone) {
super(iRobot); this(iRobot);
filter = iFilter; filter = iFilter;
zone = iZone; zone = iZone;

2
common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java
View file

@ -24,7 +24,7 @@ public class AIRobotGotoStationAndLoadFluids extends AIRobot {
} }
public AIRobotGotoStationAndLoadFluids(EntityRobotBase iRobot, IFluidFilter iFilter, IZone iZone) { public AIRobotGotoStationAndLoadFluids(EntityRobotBase iRobot, IFluidFilter iFilter, IZone iZone) {
super(iRobot); this(iRobot);
zone = iZone; zone = iZone;
filter = iFilter; filter = iFilter;

2
common/buildcraft/robotics/ai/AIRobotGotoStationAndUnload.java
View file

@ -24,7 +24,7 @@ public class AIRobotGotoStationAndUnload extends AIRobot {
} }
public AIRobotGotoStationAndUnload(EntityRobotBase iRobot, IZone iZone) { public AIRobotGotoStationAndUnload(EntityRobotBase iRobot, IZone iZone) {
super(iRobot); this(iRobot);
zone = iZone; zone = iZone;
} }

2
common/buildcraft/robotics/ai/AIRobotGotoStationAndUnloadFluids.java
View file

@ -22,7 +22,7 @@ public class AIRobotGotoStationAndUnloadFluids extends AIRobot {
} }
public AIRobotGotoStationAndUnloadFluids(EntityRobotBase iRobot, IZone iZone) { public AIRobotGotoStationAndUnloadFluids(EntityRobotBase iRobot, IZone iZone) {
super(iRobot); this(iRobot);
zone = iZone; zone = iZone;
} }

2
common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java
View file

@ -33,7 +33,7 @@ public class AIRobotGotoStationToLoad extends AIRobot {
} }
public AIRobotGotoStationToLoad(EntityRobotBase iRobot, IStackFilter iFilter, IZone iZone) { public AIRobotGotoStationToLoad(EntityRobotBase iRobot, IStackFilter iFilter, IZone iZone) {
super(iRobot); this(iRobot);
filter = iFilter; filter = iFilter;
zone = iZone; zone = iZone;

2
common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java
View file

@ -32,7 +32,7 @@ public class AIRobotGotoStationToLoadFluids extends AIRobot {
} }
public AIRobotGotoStationToLoadFluids(EntityRobotBase iRobot, IFluidFilter iFiler, IZone iZone) { public AIRobotGotoStationToLoadFluids(EntityRobotBase iRobot, IFluidFilter iFiler, IZone iZone) {
super(iRobot); this(iRobot);
zone = iZone; zone = iZone;
filter = iFiler; filter = iFiler;

2
common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java
View file

@ -32,7 +32,7 @@ public class AIRobotGotoStationToUnload extends AIRobot {
} }
public AIRobotGotoStationToUnload(EntityRobotBase iRobot, IZone iZone) { public AIRobotGotoStationToUnload(EntityRobotBase iRobot, IZone iZone) {
super(iRobot); this(iRobot);
zone = iZone; zone = iZone;

2
common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java
View file

@ -31,7 +31,7 @@ public class AIRobotGotoStationToUnloadFluids extends AIRobot {
} }
public AIRobotGotoStationToUnloadFluids(EntityRobotBase iRobot, IZone iZone) { public AIRobotGotoStationToUnloadFluids(EntityRobotBase iRobot, IZone iZone) {
super(iRobot); this(iRobot);
zone = iZone; zone = iZone;
} }

2
common/buildcraft/robotics/ai/AIRobotLoad.java
View file

@ -34,7 +34,7 @@ public class AIRobotLoad extends AIRobot {
} }
public AIRobotLoad(EntityRobotBase iRobot, IStackFilter iFilter) { public AIRobotLoad(EntityRobotBase iRobot, IStackFilter iFilter) {
super(iRobot); this(iRobot);
filter = iFilter; filter = iFilter;
} }

2
common/buildcraft/robotics/ai/AIRobotLoadFluids.java
View file

@ -31,7 +31,7 @@ public class AIRobotLoadFluids extends AIRobot {
} }
public AIRobotLoadFluids(EntityRobotBase iRobot, IFluidFilter iFilter) { public AIRobotLoadFluids(EntityRobotBase iRobot, IFluidFilter iFilter) {
super(iRobot); this(iRobot);
filter = iFilter; filter = iFilter;
} }

2
common/buildcraft/robotics/ai/AIRobotPumpBlock.java
View file

@ -28,7 +28,7 @@ public class AIRobotPumpBlock extends AIRobot {
} }
public AIRobotPumpBlock(EntityRobotBase iRobot, BlockIndex iBlockToPump) { public AIRobotPumpBlock(EntityRobotBase iRobot, BlockIndex iBlockToPump) {
super(iRobot); this(iRobot);
blockToPump = iBlockToPump; blockToPump = iBlockToPump;
} }

2
common/buildcraft/robotics/ai/AIRobotRecharge.java
View file

@ -16,8 +16,6 @@ import buildcraft.robotics.IStationFilter;
public class AIRobotRecharge extends AIRobot { public class AIRobotRecharge extends AIRobot {
private DockingStation axeDocking = null;
public AIRobotRecharge(EntityRobotBase iRobot) { public AIRobotRecharge(EntityRobotBase iRobot) {
super(iRobot); super(iRobot);
} }

2
common/buildcraft/robotics/ai/AIRobotSearchAndGotoStation.java
View file

@ -25,7 +25,7 @@ public class AIRobotSearchAndGotoStation extends AIRobot {
} }
public AIRobotSearchAndGotoStation(EntityRobotBase iRobot, IStationFilter iFilter, IZone iZone) { public AIRobotSearchAndGotoStation(EntityRobotBase iRobot, IStationFilter iFilter, IZone iZone) {
super(iRobot); this(iRobot);
filter = iFilter; filter = iFilter;
zone = iZone; zone = iZone;

4
common/buildcraft/robotics/ai/AIRobotSearchEntity.java
View file

@ -12,7 +12,6 @@ import net.minecraft.entity.Entity;
import buildcraft.api.core.IZone; import buildcraft.api.core.IZone;
import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.AIRobot;
import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.EntityRobotBase;
import buildcraft.core.lib.inventory.TransactorSimple;
import buildcraft.core.lib.utils.IEntityFilter; import buildcraft.core.lib.utils.IEntityFilter;
public class AIRobotSearchEntity extends AIRobot { public class AIRobotSearchEntity extends AIRobot {
@ -28,7 +27,7 @@ public class AIRobotSearchEntity extends AIRobot {
} }
public AIRobotSearchEntity(EntityRobotBase iRobot, IEntityFilter iFilter, float iMaxRange, IZone iZone) { public AIRobotSearchEntity(EntityRobotBase iRobot, IEntityFilter iFilter, float iMaxRange, IZone iZone) {
super(iRobot); this(iRobot);
maxRange = iMaxRange; maxRange = iMaxRange;
zone = iZone; zone = iZone;
@ -38,7 +37,6 @@ public class AIRobotSearchEntity extends AIRobot {
@Override @Override
public void start() { public void start() {
double previousDistance = Double.MAX_VALUE; double previousDistance = Double.MAX_VALUE;
TransactorSimple inventoryInsert = new TransactorSimple(robot);
for (Object o : robot.worldObj.loadedEntityList) { for (Object o : robot.worldObj.loadedEntityList) {
Entity e = (Entity) o; Entity e = (Entity) o;

6
common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java
View file

@ -26,8 +26,12 @@ public class AIRobotSearchRandomGroundBlock extends AIRobot {
private IZone zone; private IZone zone;
private int attempts = 0; private int attempts = 0;
public AIRobotSearchRandomGroundBlock(EntityRobotBase iRobot, int iRange, IBlockFilter iFilter, IZone iZone) { public AIRobotSearchRandomGroundBlock(EntityRobotBase iRobot) {
super(iRobot); super(iRobot);
}
public AIRobotSearchRandomGroundBlock(EntityRobotBase iRobot, int iRange, IBlockFilter iFilter, IZone iZone) {
this(iRobot);
range = iRange; range = iRange;
filter = iFilter; filter = iFilter;

2
common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java
View file

@ -42,7 +42,7 @@ public class AIRobotSearchStackRequest extends AIRobot {
} }
public AIRobotSearchStackRequest(EntityRobotBase iRobot, IStackFilter iFilter, Collection<ItemStack> iBlackList) { public AIRobotSearchStackRequest(EntityRobotBase iRobot, IStackFilter iFilter, Collection<ItemStack> iBlackList) {
super(iRobot); this(iRobot);
blackList = iBlackList; blackList = iBlackList;
filter = iFilter; filter = iFilter;

2
common/buildcraft/robotics/ai/AIRobotSearchStation.java
View file

@ -26,7 +26,7 @@ public class AIRobotSearchStation extends AIRobot {
} }
public AIRobotSearchStation(EntityRobotBase iRobot, IStationFilter iFilter, IZone iZone) { public AIRobotSearchStation(EntityRobotBase iRobot, IStationFilter iFilter, IZone iZone) {
super(iRobot); this(iRobot);
filter = iFilter; filter = iFilter;
zone = iZone; zone = iZone;

3
common/buildcraft/robotics/ai/AIRobotStraightMoveTo.java
View file

@ -21,8 +21,7 @@ public class AIRobotStraightMoveTo extends AIRobotGoto {
} }
public AIRobotStraightMoveTo(EntityRobotBase iRobot, float ix, float iy, float iz) { public AIRobotStraightMoveTo(EntityRobotBase iRobot, float ix, float iy, float iz) {
super(iRobot); this(iRobot);
robot = iRobot;
x = ix; x = ix;
y = iy; y = iy;
z = iz; z = iz;

6
common/buildcraft/robotics/ai/AIRobotStripesHandler.java
View file

@ -32,7 +32,7 @@ public class AIRobotStripesHandler extends AIRobot implements IStripesActivator
} }
public AIRobotStripesHandler(EntityRobotBase iRobot, BlockIndex index) { public AIRobotStripesHandler(EntityRobotBase iRobot, BlockIndex index) {
super(iRobot); this(iRobot);
useToBlock = index; useToBlock = index;
} }
@ -75,10 +75,6 @@ public class AIRobotStripesHandler extends AIRobot implements IStripesActivator
} }
} }
private ForgeDirection getDirection() {
return null;
}
@Override @Override
public void end() { public void end() {
robot.setItemActive(false); robot.setItemActive(false);

2
common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java
View file

@ -26,7 +26,7 @@ public class AIRobotUseToolOnBlock extends AIRobot {
} }
public AIRobotUseToolOnBlock(EntityRobotBase iRobot, BlockIndex index) { public AIRobotUseToolOnBlock(EntityRobotBase iRobot, BlockIndex index) {
super(iRobot); this(iRobot);
useToBlock = index; useToBlock = index;
} }

3
common/buildcraft/robotics/boards/BoardRobotBomber.java
View file

@ -15,7 +15,6 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobot;
import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.boards.RedstoneBoardRobotNBT;
import buildcraft.api.core.BlockIndex;
import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.AIRobot;
import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.EntityRobotBase;
import buildcraft.core.lib.inventory.ITransactor; 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 static final IStackFilter TNT_FILTER = new ArrayStackFilter(new ItemStack(Blocks.tnt));
private BlockIndex target = null;
private int flyingHeight = 20; private int flyingHeight = 20;
public BoardRobotBomber(EntityRobotBase iRobot) { public BoardRobotBomber(EntityRobotBase iRobot) {

3
common/buildcraft/robotics/boards/BoardRobotCrafter.java
View file

@ -9,7 +9,6 @@
package buildcraft.robotics.boards; package buildcraft.robotics.boards;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.CraftingManager;
@ -24,7 +23,6 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT;
import buildcraft.api.recipes.CraftingResult; import buildcraft.api.recipes.CraftingResult;
import buildcraft.api.recipes.IFlexibleRecipe; import buildcraft.api.recipes.IFlexibleRecipe;
import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.AIRobot;
import buildcraft.api.robots.DockingStation;
import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.EntityRobotBase;
import buildcraft.api.robots.StackRequest; import buildcraft.api.robots.StackRequest;
import buildcraft.core.lib.inventory.StackHelper; import buildcraft.core.lib.inventory.StackHelper;
@ -45,7 +43,6 @@ public class BoardRobotCrafter extends RedstoneBoardRobot {
private ItemStack order; private ItemStack order;
private ArrayList<ItemStack> craftingBlacklist = new ArrayList<ItemStack>(); private ArrayList<ItemStack> craftingBlacklist = new ArrayList<ItemStack>();
private HashSet<DockingStation> reservedStations = new HashSet<DockingStation>();
private StackRequest currentRequest = null; private StackRequest currentRequest = null;
public BoardRobotCrafter(EntityRobotBase iRobot) { public BoardRobotCrafter(EntityRobotBase iRobot) {

7
common/buildcraft/robotics/boards/BoardRobotPicker.java
View file

@ -25,17 +25,10 @@ public class BoardRobotPicker extends RedstoneBoardRobot {
// TODO: Clean this when world unloaded // TODO: Clean this when world unloaded
public static Set<Integer> targettedItems = new HashSet<Integer>(); public static Set<Integer> targettedItems = new HashSet<Integer>();
private NBTTagCompound data;
public BoardRobotPicker(EntityRobotBase iRobot) { public BoardRobotPicker(EntityRobotBase iRobot) {
super(iRobot); super(iRobot);
} }
public BoardRobotPicker(EntityRobotBase robot, NBTTagCompound nbt) {
super(robot);
data = nbt;
}
@Override @Override
public void update() { public void update() {
startDelegateAI(new AIRobotFetchItem(robot, 250, ActionRobotFilter.getGateFilter(robot startDelegateAI(new AIRobotFetchItem(robot, 250, ActionRobotFilter.getGateFilter(robot

2
common/buildcraft/robotics/boards/BoardRobotPickerNBT.java
View file

@ -44,7 +44,7 @@ public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT {
@Override @Override
public RedstoneBoardRobot create(NBTTagCompound nbt, EntityRobotBase object) { public RedstoneBoardRobot create(NBTTagCompound nbt, EntityRobotBase object) {
return new BoardRobotPicker(object, nbt); return new BoardRobotPicker(object);
} }
@Override @Override

2
common/buildcraft/robotics/boards/BoardRobotShovelman.java
View file

@ -16,8 +16,6 @@ import buildcraft.api.robots.EntityRobotBase;
public class BoardRobotShovelman extends BoardRobotGenericBreakBlock { public class BoardRobotShovelman extends BoardRobotGenericBreakBlock {
private boolean extendedOre = false;
public BoardRobotShovelman(EntityRobotBase iRobot) { public BoardRobotShovelman(EntityRobotBase iRobot) {
super(iRobot); super(iRobot);
} }

6
common/buildcraft/robotics/boards/BoardRobotStripes.java
View file

@ -117,10 +117,4 @@ public class BoardRobotStripes extends RedstoneBoardRobot {
blockFound = new BlockIndex(nbt.getCompoundTag("blockFound")); 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);
}
}
} }