From 0945972f60c9c2e2518b12aa49cbd9129b35e749 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Thu, 2 Apr 2015 09:58:18 -0300 Subject: [PATCH] robotics package cleanup --- common/buildcraft/robotics/ai/AIRobotAttack.java | 4 ++-- common/buildcraft/robotics/ai/AIRobotBreak.java | 2 +- .../buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java | 2 +- common/buildcraft/robotics/ai/AIRobotCraftFurnace.java | 2 +- common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java | 2 +- common/buildcraft/robotics/ai/AIRobotDeliverRequested.java | 2 +- .../robotics/ai/AIRobotFetchAndEquipItemStack.java | 2 +- common/buildcraft/robotics/ai/AIRobotFetchItem.java | 4 +--- common/buildcraft/robotics/ai/AIRobotGoAndLinkToDock.java | 2 +- common/buildcraft/robotics/ai/AIRobotGotoBlock.java | 2 +- common/buildcraft/robotics/ai/AIRobotGotoStation.java | 2 +- .../buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java | 2 +- .../robotics/ai/AIRobotGotoStationAndLoadFluids.java | 2 +- .../robotics/ai/AIRobotGotoStationAndUnload.java | 2 +- .../robotics/ai/AIRobotGotoStationAndUnloadFluids.java | 2 +- .../buildcraft/robotics/ai/AIRobotGotoStationToLoad.java | 2 +- .../robotics/ai/AIRobotGotoStationToLoadFluids.java | 2 +- .../buildcraft/robotics/ai/AIRobotGotoStationToUnload.java | 2 +- .../robotics/ai/AIRobotGotoStationToUnloadFluids.java | 2 +- common/buildcraft/robotics/ai/AIRobotLoad.java | 2 +- common/buildcraft/robotics/ai/AIRobotLoadFluids.java | 2 +- common/buildcraft/robotics/ai/AIRobotPumpBlock.java | 2 +- common/buildcraft/robotics/ai/AIRobotRecharge.java | 2 -- .../robotics/ai/AIRobotSearchAndGotoStation.java | 2 +- common/buildcraft/robotics/ai/AIRobotSearchEntity.java | 4 +--- .../robotics/ai/AIRobotSearchRandomGroundBlock.java | 6 +++++- .../buildcraft/robotics/ai/AIRobotSearchStackRequest.java | 2 +- common/buildcraft/robotics/ai/AIRobotSearchStation.java | 2 +- common/buildcraft/robotics/ai/AIRobotStraightMoveTo.java | 3 +-- common/buildcraft/robotics/ai/AIRobotStripesHandler.java | 6 +----- common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java | 2 +- common/buildcraft/robotics/boards/BoardRobotBomber.java | 3 --- common/buildcraft/robotics/boards/BoardRobotCrafter.java | 3 --- common/buildcraft/robotics/boards/BoardRobotPicker.java | 7 ------- common/buildcraft/robotics/boards/BoardRobotPickerNBT.java | 2 +- common/buildcraft/robotics/boards/BoardRobotShovelman.java | 2 -- common/buildcraft/robotics/boards/BoardRobotStripes.java | 6 ------ 37 files changed, 36 insertions(+), 64 deletions(-) diff --git a/common/buildcraft/robotics/ai/AIRobotAttack.java b/common/buildcraft/robotics/ai/AIRobotAttack.java index 42f45aff..b0462315 100755 --- a/common/buildcraft/robotics/ai/AIRobotAttack.java +++ b/common/buildcraft/robotics/ai/AIRobotAttack.java @@ -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); } diff --git a/common/buildcraft/robotics/ai/AIRobotBreak.java b/common/buildcraft/robotics/ai/AIRobotBreak.java index cd82983a..f604fdde 100644 --- a/common/buildcraft/robotics/ai/AIRobotBreak.java +++ b/common/buildcraft/robotics/ai/AIRobotBreak.java @@ -36,7 +36,7 @@ public class AIRobotBreak extends AIRobot { } public AIRobotBreak(EntityRobotBase iRobot, BlockIndex iBlockToBreak) { - super(iRobot); + this(iRobot); blockToBreak = iBlockToBreak; } diff --git a/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java b/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java index 587b8bfa..8e8c51a1 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftAssemblyTable.java @@ -51,7 +51,7 @@ public class AIRobotCraftAssemblyTable extends AIRobotCraftGeneric { } public AIRobotCraftAssemblyTable(EntityRobotBase iRobot, CraftingResult craftingResult) { - super(iRobot); + this(iRobot); expectedResult = craftingResult; } diff --git a/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java b/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java index 9b0490a2..a1b51fd7 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftFurnace.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java b/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java index 14cc4607..c9b5672c 100755 --- a/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java +++ b/common/buildcraft/robotics/ai/AIRobotCraftWorkbench.java @@ -49,7 +49,7 @@ public class AIRobotCraftWorkbench extends AIRobotCraftGeneric { } public AIRobotCraftWorkbench(EntityRobotBase iRobot, IRecipe iRecipe) { - super(iRobot); + this(iRobot); recipe = iRecipe; } diff --git a/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java b/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java index 8a3fee1c..13e32a9e 100755 --- a/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java +++ b/common/buildcraft/robotics/ai/AIRobotDeliverRequested.java @@ -34,7 +34,7 @@ public class AIRobotDeliverRequested extends AIRobot { } public AIRobotDeliverRequested(EntityRobotBase robot, StackRequest request) { - super(robot); + this(robot); requested = request; } diff --git a/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java b/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java index 3bd4a2ce..1286d367 100755 --- a/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java +++ b/common/buildcraft/robotics/ai/AIRobotFetchAndEquipItemStack.java @@ -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); } diff --git a/common/buildcraft/robotics/ai/AIRobotFetchItem.java b/common/buildcraft/robotics/ai/AIRobotFetchItem.java index 719cea36..6822059d 100755 --- a/common/buildcraft/robotics/ai/AIRobotFetchItem.java +++ b/common/buildcraft/robotics/ai/AIRobotFetchItem.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotGoAndLinkToDock.java b/common/buildcraft/robotics/ai/AIRobotGoAndLinkToDock.java index eba32af2..264e9434 100755 --- a/common/buildcraft/robotics/ai/AIRobotGoAndLinkToDock.java +++ b/common/buildcraft/robotics/ai/AIRobotGoAndLinkToDock.java @@ -21,7 +21,7 @@ public class AIRobotGoAndLinkToDock extends AIRobot { } public AIRobotGoAndLinkToDock(EntityRobotBase iRobot, DockingStation iStation) { - super(iRobot); + this(iRobot); station = iStation; } diff --git a/common/buildcraft/robotics/ai/AIRobotGotoBlock.java b/common/buildcraft/robotics/ai/AIRobotGotoBlock.java index 617e03fb..adcabab0 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoBlock.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStation.java b/common/buildcraft/robotics/ai/AIRobotGotoStation.java index 819ab24b..4eb36e98 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStation.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStation.java @@ -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(); diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java b/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java index 5e97e09d..62ad07b8 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoad.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java b/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java index a781f825..861ef38e 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationAndLoadFluids.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationAndUnload.java b/common/buildcraft/robotics/ai/AIRobotGotoStationAndUnload.java index fdb8c34a..0997dbfa 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationAndUnload.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationAndUnload.java @@ -24,7 +24,7 @@ public class AIRobotGotoStationAndUnload extends AIRobot { } public AIRobotGotoStationAndUnload(EntityRobotBase iRobot, IZone iZone) { - super(iRobot); + this(iRobot); zone = iZone; } diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationAndUnloadFluids.java b/common/buildcraft/robotics/ai/AIRobotGotoStationAndUnloadFluids.java index 44ea851d..a511fe3a 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationAndUnloadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationAndUnloadFluids.java @@ -22,7 +22,7 @@ public class AIRobotGotoStationAndUnloadFluids extends AIRobot { } public AIRobotGotoStationAndUnloadFluids(EntityRobotBase iRobot, IZone iZone) { - super(iRobot); + this(iRobot); zone = iZone; } diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java index 08cc578a..3c84f6b3 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoad.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java index 143d95d8..fddc7fd6 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToLoadFluids.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java index dcd818f5..a95ff798 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnload.java @@ -32,7 +32,7 @@ public class AIRobotGotoStationToUnload extends AIRobot { } public AIRobotGotoStationToUnload(EntityRobotBase iRobot, IZone iZone) { - super(iRobot); + this(iRobot); zone = iZone; diff --git a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java index cefddbb2..28fa2c4f 100755 --- a/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotGotoStationToUnloadFluids.java @@ -31,7 +31,7 @@ public class AIRobotGotoStationToUnloadFluids extends AIRobot { } public AIRobotGotoStationToUnloadFluids(EntityRobotBase iRobot, IZone iZone) { - super(iRobot); + this(iRobot); zone = iZone; } diff --git a/common/buildcraft/robotics/ai/AIRobotLoad.java b/common/buildcraft/robotics/ai/AIRobotLoad.java index a0626050..b79476f3 100755 --- a/common/buildcraft/robotics/ai/AIRobotLoad.java +++ b/common/buildcraft/robotics/ai/AIRobotLoad.java @@ -34,7 +34,7 @@ public class AIRobotLoad extends AIRobot { } public AIRobotLoad(EntityRobotBase iRobot, IStackFilter iFilter) { - super(iRobot); + this(iRobot); filter = iFilter; } diff --git a/common/buildcraft/robotics/ai/AIRobotLoadFluids.java b/common/buildcraft/robotics/ai/AIRobotLoadFluids.java index 582fe669..d9062261 100755 --- a/common/buildcraft/robotics/ai/AIRobotLoadFluids.java +++ b/common/buildcraft/robotics/ai/AIRobotLoadFluids.java @@ -31,7 +31,7 @@ public class AIRobotLoadFluids extends AIRobot { } public AIRobotLoadFluids(EntityRobotBase iRobot, IFluidFilter iFilter) { - super(iRobot); + this(iRobot); filter = iFilter; } diff --git a/common/buildcraft/robotics/ai/AIRobotPumpBlock.java b/common/buildcraft/robotics/ai/AIRobotPumpBlock.java index 7acbb2b9..ad77a86a 100644 --- a/common/buildcraft/robotics/ai/AIRobotPumpBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotPumpBlock.java @@ -28,7 +28,7 @@ public class AIRobotPumpBlock extends AIRobot { } public AIRobotPumpBlock(EntityRobotBase iRobot, BlockIndex iBlockToPump) { - super(iRobot); + this(iRobot); blockToPump = iBlockToPump; } diff --git a/common/buildcraft/robotics/ai/AIRobotRecharge.java b/common/buildcraft/robotics/ai/AIRobotRecharge.java index 34e9e82c..b52e3919 100755 --- a/common/buildcraft/robotics/ai/AIRobotRecharge.java +++ b/common/buildcraft/robotics/ai/AIRobotRecharge.java @@ -16,8 +16,6 @@ import buildcraft.robotics.IStationFilter; public class AIRobotRecharge extends AIRobot { - private DockingStation axeDocking = null; - public AIRobotRecharge(EntityRobotBase iRobot) { super(iRobot); } diff --git a/common/buildcraft/robotics/ai/AIRobotSearchAndGotoStation.java b/common/buildcraft/robotics/ai/AIRobotSearchAndGotoStation.java index 64fe5e83..bcc297e6 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchAndGotoStation.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchAndGotoStation.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotSearchEntity.java b/common/buildcraft/robotics/ai/AIRobotSearchEntity.java index d2cebe13..5ad8367d 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchEntity.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchEntity.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java b/common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java index 1d017fd5..6a73c6a8 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchRandomGroundBlock.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java b/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java index 2e406815..c7a14df9 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchStackRequest.java @@ -42,7 +42,7 @@ public class AIRobotSearchStackRequest extends AIRobot { } public AIRobotSearchStackRequest(EntityRobotBase iRobot, IStackFilter iFilter, Collection iBlackList) { - super(iRobot); + this(iRobot); blackList = iBlackList; filter = iFilter; diff --git a/common/buildcraft/robotics/ai/AIRobotSearchStation.java b/common/buildcraft/robotics/ai/AIRobotSearchStation.java index 078e07be..459ec928 100755 --- a/common/buildcraft/robotics/ai/AIRobotSearchStation.java +++ b/common/buildcraft/robotics/ai/AIRobotSearchStation.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotStraightMoveTo.java b/common/buildcraft/robotics/ai/AIRobotStraightMoveTo.java index 71b95e7a..4f55e603 100755 --- a/common/buildcraft/robotics/ai/AIRobotStraightMoveTo.java +++ b/common/buildcraft/robotics/ai/AIRobotStraightMoveTo.java @@ -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; diff --git a/common/buildcraft/robotics/ai/AIRobotStripesHandler.java b/common/buildcraft/robotics/ai/AIRobotStripesHandler.java index 4012130e..d9fa161a 100644 --- a/common/buildcraft/robotics/ai/AIRobotStripesHandler.java +++ b/common/buildcraft/robotics/ai/AIRobotStripesHandler.java @@ -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); diff --git a/common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java b/common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java index 2f4a0128..3eff0560 100755 --- a/common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java +++ b/common/buildcraft/robotics/ai/AIRobotUseToolOnBlock.java @@ -26,7 +26,7 @@ public class AIRobotUseToolOnBlock extends AIRobot { } public AIRobotUseToolOnBlock(EntityRobotBase iRobot, BlockIndex index) { - super(iRobot); + this(iRobot); useToBlock = index; } diff --git a/common/buildcraft/robotics/boards/BoardRobotBomber.java b/common/buildcraft/robotics/boards/BoardRobotBomber.java index bd129af5..16f33e80 100755 --- a/common/buildcraft/robotics/boards/BoardRobotBomber.java +++ b/common/buildcraft/robotics/boards/BoardRobotBomber.java @@ -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) { diff --git a/common/buildcraft/robotics/boards/BoardRobotCrafter.java b/common/buildcraft/robotics/boards/BoardRobotCrafter.java index 4e10ccf6..4d68a8a0 100755 --- a/common/buildcraft/robotics/boards/BoardRobotCrafter.java +++ b/common/buildcraft/robotics/boards/BoardRobotCrafter.java @@ -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 craftingBlacklist = new ArrayList(); - private HashSet reservedStations = new HashSet(); private StackRequest currentRequest = null; public BoardRobotCrafter(EntityRobotBase iRobot) { diff --git a/common/buildcraft/robotics/boards/BoardRobotPicker.java b/common/buildcraft/robotics/boards/BoardRobotPicker.java index 536a413b..c48d5966 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPicker.java +++ b/common/buildcraft/robotics/boards/BoardRobotPicker.java @@ -25,17 +25,10 @@ public class BoardRobotPicker extends RedstoneBoardRobot { // TODO: Clean this when world unloaded public static Set targettedItems = new HashSet(); - 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 diff --git a/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java b/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java index 8a658c2d..6e2385e7 100755 --- a/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java +++ b/common/buildcraft/robotics/boards/BoardRobotPickerNBT.java @@ -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 diff --git a/common/buildcraft/robotics/boards/BoardRobotShovelman.java b/common/buildcraft/robotics/boards/BoardRobotShovelman.java index 90737911..095f4723 100755 --- a/common/buildcraft/robotics/boards/BoardRobotShovelman.java +++ b/common/buildcraft/robotics/boards/BoardRobotShovelman.java @@ -16,8 +16,6 @@ import buildcraft.api.robots.EntityRobotBase; public class BoardRobotShovelman extends BoardRobotGenericBreakBlock { - private boolean extendedOre = false; - public BoardRobotShovelman(EntityRobotBase iRobot) { super(iRobot); } diff --git a/common/buildcraft/robotics/boards/BoardRobotStripes.java b/common/buildcraft/robotics/boards/BoardRobotStripes.java index f25b21e3..18a50b8c 100644 --- a/common/buildcraft/robotics/boards/BoardRobotStripes.java +++ b/common/buildcraft/robotics/boards/BoardRobotStripes.java @@ -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); - } - } }