From f0e06e1662c7b776e29eda79a38bea74a9af94dd Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 24 Jan 2015 09:33:40 +0100 Subject: [PATCH] make robots store energy in the ItemStack, make robots chargeable, begin refactoring rboots to separate module --- common/buildcraft/BuildCraftCore.java | 2 +- common/buildcraft/BuildCraftSilicon.java | 70 +++++++++---------- common/buildcraft/BuildCraftTransport.java | 4 +- common/buildcraft/builders/TileBuilder.java | 4 +- .../buildcraft/commander/TileRequester.java | 4 +- .../core/proxy/CoreProxyClient.java | 4 +- .../core/{robots => utils}/IBlockFilter.java | 2 +- .../core/{robots => utils}/IEntityFilter.java | 2 +- common/buildcraft/core/utils/PathFinding.java | 1 - .../{core => }/robots/DockingStation.java | 2 +- .../{core => }/robots/EntityRobot.java | 8 ++- .../EntityRobotEnergyParticle.java} | 16 ++--- .../{core => }/robots/IStationFilter.java | 2 +- .../{core => robots}/ItemRobot.java | 51 ++++++++++++-- .../ItemRobotStation.java | 2 +- .../robots/ResourceIdAssemblyTable.java | 2 +- .../{core => }/robots/ResourceIdBlock.java | 2 +- .../{core => }/robots/ResourceIdRequest.java | 2 +- .../robots/RobotIntegrationRecipe.java | 6 +- .../{core => }/robots/RobotRegistry.java | 2 +- .../RobotStationPluggable.java | 4 +- .../{core => }/robots/StationIndex.java | 2 +- .../robots => robots/ai}/AIRobotAttack.java | 3 +- .../robots => robots/ai}/AIRobotBreak.java | 2 +- .../ai}/AIRobotCraftAssemblyTable.java | 11 ++- .../ai}/AIRobotCraftFurnace.java | 9 ++- .../ai}/AIRobotCraftGeneric.java | 2 +- .../ai}/AIRobotCraftWorkbench.java | 8 ++- .../ai}/AIRobotDeliverRequested.java | 6 +- .../ai}/AIRobotDisposeItems.java | 2 +- .../ai}/AIRobotFetchAndEquipItemStack.java | 3 +- .../ai}/AIRobotFetchItem.java | 4 +- .../ai}/AIRobotGoAndLinkToDock.java | 3 +- .../robots => robots/ai}/AIRobotGoto.java | 2 +- .../ai}/AIRobotGotoBlock.java | 2 +- .../ai}/AIRobotGotoRandomGroundBlock.java | 3 +- .../ai}/AIRobotGotoSleep.java | 2 +- .../ai}/AIRobotGotoStation.java | 3 +- .../ai}/AIRobotGotoStationAndLoad.java | 2 +- .../ai}/AIRobotGotoStationAndLoadFluids.java | 2 +- .../ai}/AIRobotGotoStationAndUnload.java | 3 +- .../AIRobotGotoStationAndUnloadFluids.java | 2 +- .../ai}/AIRobotGotoStationToLoad.java | 8 ++- .../ai}/AIRobotGotoStationToLoadFluids.java | 8 ++- .../ai}/AIRobotGotoStationToUnload.java | 7 +- .../ai}/AIRobotGotoStationToUnloadFluids.java | 8 ++- .../robots => robots/ai}/AIRobotLoad.java | 7 +- .../ai}/AIRobotLoadFluids.java | 7 +- .../robots => robots/ai}/AIRobotMain.java | 2 +- .../ai}/AIRobotPumpBlock.java | 2 +- .../robots => robots/ai}/AIRobotRecharge.java | 4 +- .../ai}/AIRobotSearchAndGotoStation.java | 4 +- .../ai}/AIRobotSearchBlock.java | 3 +- .../ai}/AIRobotSearchEntity.java | 3 +- .../ai}/AIRobotSearchRandomGroundBlock.java | 3 +- .../ai}/AIRobotSearchStackRequest.java | 10 +-- .../ai}/AIRobotSearchStation.java | 6 +- .../robots => robots/ai}/AIRobotSleep.java | 5 +- .../ai}/AIRobotStraightMoveTo.java | 2 +- .../robots => robots/ai}/AIRobotUnload.java | 6 +- .../ai}/AIRobotUnloadFluids.java | 7 +- .../ai}/AIRobotUseToolOnBlock.java | 2 +- .../robots/boards/BoardRobotBomber.java | 12 ++-- .../robots/boards/BoardRobotBomberNBT.java | 2 +- .../robots/boards/BoardRobotBuilder.java | 12 ++-- .../robots/boards/BoardRobotBuilderNBT.java | 2 +- .../robots/boards/BoardRobotButcher.java | 12 ++-- .../robots/boards/BoardRobotButcherNBT.java | 2 +- .../robots/boards/BoardRobotCarrier.java | 12 ++-- .../robots/boards/BoardRobotCarrierNBT.java | 2 +- .../robots/boards/BoardRobotCrafter.java | 24 +++---- .../robots/boards/BoardRobotCrafterNBT.java | 2 +- .../robots/boards/BoardRobotDelivery.java | 14 ++-- .../robots/boards/BoardRobotDeliveryNBT.java | 2 +- .../robots/boards/BoardRobotFarmer.java | 18 ++--- .../robots/boards/BoardRobotFarmerNBT.java | 2 +- .../robots/boards/BoardRobotFluidCarrier.java | 10 +-- .../boards/BoardRobotFluidCarrierNBT.java | 2 +- .../boards/BoardRobotGenericBreakBlock.java | 20 +++--- .../robots/boards/BoardRobotHarvester.java | 2 +- .../robots/boards/BoardRobotHarvesterNBT.java | 2 +- .../robots/boards/BoardRobotKnight.java | 12 ++-- .../robots/boards/BoardRobotKnightNBT.java | 2 +- .../robots/boards/BoardRobotLeaveCutter.java | 2 +- .../boards/BoardRobotLeaveCutterNBT.java | 2 +- .../robots/boards/BoardRobotLumberjack.java | 2 +- .../boards/BoardRobotLumberjackNBT.java | 2 +- .../robots/boards/BoardRobotMiner.java | 4 +- .../robots/boards/BoardRobotMinerNBT.java | 2 +- .../robots/boards/BoardRobotPicker.java | 10 +-- .../robots/boards/BoardRobotPickerNBT.java | 4 +- .../robots/boards/BoardRobotPlanter.java | 20 +++--- .../robots/boards/BoardRobotPlanterNBT.java | 2 +- .../robots/boards/BoardRobotPump.java | 20 +++--- .../robots/boards/BoardRobotPumpNBT.java | 2 +- .../robots/boards/BoardRobotShovelman.java | 2 +- .../robots/boards/BoardRobotShovelmanNBT.java | 2 +- .../{core => robots}/render/RenderRobot.java | 10 +-- .../statements/ActionRobotFilter.java | 4 +- .../statements/ActionRobotGotoStation.java | 10 +-- .../statements/ActionRobotWakeUp.java | 2 +- .../statements/ActionRobotWorkInArea.java | 2 +- .../statements/ActionStationAcceptFluids.java | 2 +- .../ActionStationAcceptItemsInv.java | 6 +- .../ActionStationAcceptItemsPipe.java | 6 +- .../statements/ActionStationAllowCraft.java | 2 +- .../statements/ActionStationForbidRobot.java | 6 +- .../statements/ActionStationInputItems.java | 6 +- .../ActionStationProvideFluids.java | 2 +- .../statements/ActionStationProvideItems.java | 2 +- .../statements/ActionStationRequestItems.java | 6 +- .../ActionStationRequestItemsMachine.java | 2 +- .../statements/RobotsActionProvider.java | 4 +- .../statements/RobotsTriggerProvider.java | 2 +- .../statements/StateStationProvideItems.java | 2 +- .../statements/StateStationRequestItems.java | 2 +- .../statements/TriggerRobotSleep.java | 8 +-- .../buildcraft/silicon/TileAssemblyTable.java | 6 +- .../transport/BlockGenericPipe.java | 11 +-- .../buildcraft/transport/TileGenericPipe.java | 13 +--- 120 files changed, 404 insertions(+), 328 deletions(-) rename common/buildcraft/core/{robots => utils}/IBlockFilter.java (93%) rename common/buildcraft/core/{robots => utils}/IEntityFilter.java (92%) rename common/buildcraft/{core => }/robots/DockingStation.java (99%) rename common/buildcraft/{core => }/robots/EntityRobot.java (99%) rename common/buildcraft/{core/robots/EntityRobotEnergyFX.java => robots/EntityRobotEnergyParticle.java} (86%) rename common/buildcraft/{core => }/robots/IStationFilter.java (92%) rename common/buildcraft/{core => robots}/ItemRobot.java (65%) rename common/buildcraft/{transport/pluggable => robots}/ItemRobotStation.java (97%) rename common/buildcraft/{core => }/robots/ResourceIdAssemblyTable.java (95%) rename common/buildcraft/{core => }/robots/ResourceIdBlock.java (95%) rename common/buildcraft/{core => }/robots/ResourceIdRequest.java (95%) rename common/buildcraft/{core => }/robots/RobotIntegrationRecipe.java (91%) rename common/buildcraft/{core => }/robots/RobotRegistry.java (99%) rename common/buildcraft/{transport/pluggable => robots}/RobotStationPluggable.java (98%) rename common/buildcraft/{core => }/robots/StationIndex.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotAttack.java (96%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotBreak.java (99%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotCraftAssemblyTable.java (95%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotCraftFurnace.java (95%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotCraftGeneric.java (96%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotCraftWorkbench.java (96%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotDeliverRequested.java (93%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotDisposeItems.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotFetchAndEquipItemStack.java (96%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotFetchItem.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGoAndLinkToDock.java (95%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGoto.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoBlock.java (99%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoRandomGroundBlock.java (96%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoSleep.java (96%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoStation.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoStationAndLoad.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoStationAndLoadFluids.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoStationAndUnload.java (95%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoStationAndUnloadFluids.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoStationToLoad.java (90%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoStationToLoadFluids.java (91%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoStationToUnload.java (90%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotGotoStationToUnloadFluids.java (90%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotLoad.java (94%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotLoadFluids.java (92%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotMain.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotPumpBlock.java (98%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotRecharge.java (93%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotSearchAndGotoStation.java (91%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotSearchBlock.java (96%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotSearchEntity.java (96%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotSearchRandomGroundBlock.java (96%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotSearchStackRequest.java (93%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotSearchStation.java (92%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotSleep.java (90%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotStraightMoveTo.java (97%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotUnload.java (91%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotUnloadFluids.java (92%) rename common/buildcraft/{core/robots => robots/ai}/AIRobotUseToolOnBlock.java (98%) rename common/buildcraft/{core => }/robots/boards/BoardRobotBomber.java (90%) rename common/buildcraft/{core => }/robots/boards/BoardRobotBomberNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotBuilder.java (94%) rename common/buildcraft/{core => }/robots/boards/BoardRobotBuilderNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotButcher.java (87%) rename common/buildcraft/{core => }/robots/boards/BoardRobotButcherNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotCarrier.java (87%) rename common/buildcraft/{core => }/robots/boards/BoardRobotCarrierNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotCrafter.java (89%) rename common/buildcraft/{core => }/robots/boards/BoardRobotCrafterNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotDelivery.java (87%) rename common/buildcraft/{core => }/robots/boards/BoardRobotDeliveryNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotFarmer.java (88%) rename common/buildcraft/{core => }/robots/boards/BoardRobotFarmerNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotFluidCarrier.java (82%) rename common/buildcraft/{core => }/robots/boards/BoardRobotFluidCarrierNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotGenericBreakBlock.java (91%) rename common/buildcraft/{core => }/robots/boards/BoardRobotHarvester.java (96%) rename common/buildcraft/{core => }/robots/boards/BoardRobotHarvesterNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotKnight.java (87%) rename common/buildcraft/{core => }/robots/boards/BoardRobotKnightNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotLeaveCutter.java (96%) rename common/buildcraft/{core => }/robots/boards/BoardRobotLeaveCutterNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotLumberjack.java (96%) rename common/buildcraft/{core => }/robots/boards/BoardRobotLumberjackNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotMiner.java (94%) rename common/buildcraft/{core => }/robots/boards/BoardRobotMinerNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotPicker.java (89%) rename common/buildcraft/{core => }/robots/boards/BoardRobotPickerNBT.java (95%) rename common/buildcraft/{core => }/robots/boards/BoardRobotPlanter.java (90%) rename common/buildcraft/{core => }/robots/boards/BoardRobotPlanterNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotPump.java (89%) rename common/buildcraft/{core => }/robots/boards/BoardRobotPumpNBT.java (97%) rename common/buildcraft/{core => }/robots/boards/BoardRobotShovelman.java (96%) rename common/buildcraft/{core => }/robots/boards/BoardRobotShovelmanNBT.java (97%) rename common/buildcraft/{core => robots}/render/RenderRobot.java (96%) rename common/buildcraft/{silicon => robots}/statements/ActionRobotFilter.java (98%) rename common/buildcraft/{silicon => robots}/statements/ActionRobotGotoStation.java (92%) rename common/buildcraft/{silicon => robots}/statements/ActionRobotWakeUp.java (96%) rename common/buildcraft/{silicon => robots}/statements/ActionRobotWorkInArea.java (97%) rename common/buildcraft/{silicon => robots}/statements/ActionStationAcceptFluids.java (97%) rename common/buildcraft/{silicon => robots}/statements/ActionStationAcceptItemsInv.java (94%) rename common/buildcraft/{silicon => robots}/statements/ActionStationAcceptItemsPipe.java (94%) rename common/buildcraft/{silicon => robots}/statements/ActionStationAllowCraft.java (97%) rename common/buildcraft/{silicon => robots}/statements/ActionStationForbidRobot.java (95%) rename common/buildcraft/{silicon => robots}/statements/ActionStationInputItems.java (90%) rename common/buildcraft/{silicon => robots}/statements/ActionStationProvideFluids.java (97%) rename common/buildcraft/{silicon => robots}/statements/ActionStationProvideItems.java (97%) rename common/buildcraft/{silicon => robots}/statements/ActionStationRequestItems.java (94%) rename common/buildcraft/{silicon => robots}/statements/ActionStationRequestItemsMachine.java (96%) rename common/buildcraft/{silicon => robots}/statements/RobotsActionProvider.java (97%) rename common/buildcraft/{silicon => robots}/statements/RobotsTriggerProvider.java (97%) rename common/buildcraft/{silicon => robots}/statements/StateStationProvideItems.java (95%) rename common/buildcraft/{silicon => robots}/statements/StateStationRequestItems.java (95%) rename common/buildcraft/{silicon => robots}/statements/TriggerRobotSleep.java (91%) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 312d6d41..002311c6 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -97,7 +97,7 @@ import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.recipes.IntegrationRecipeManager; import buildcraft.core.recipes.RefineryRecipeManager; import buildcraft.core.render.BlockHighlightHandler; -import buildcraft.core.robots.EntityRobot; +import buildcraft.robots.EntityRobot; import buildcraft.core.statements.ActionMachineControl; import buildcraft.core.statements.ActionRedstoneOutput; import buildcraft.core.statements.DefaultActionProvider; diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 0cc59aba..abc1ecae 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -42,28 +42,28 @@ import buildcraft.compat.CompatHooks; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; import buildcraft.core.ItemBuildCraft; -import buildcraft.core.ItemRobot; +import buildcraft.robots.ItemRobot; import buildcraft.core.Version; import buildcraft.core.network.BuildCraftChannelHandler; import buildcraft.core.proxy.CoreProxy; -import buildcraft.core.robots.RobotIntegrationRecipe; -import buildcraft.core.robots.boards.BoardRobotBomberNBT; -import buildcraft.core.robots.boards.BoardRobotBuilderNBT; -import buildcraft.core.robots.boards.BoardRobotButcherNBT; -import buildcraft.core.robots.boards.BoardRobotCarrierNBT; -import buildcraft.core.robots.boards.BoardRobotCrafterNBT; -import buildcraft.core.robots.boards.BoardRobotDeliveryNBT; -import buildcraft.core.robots.boards.BoardRobotFarmerNBT; -import buildcraft.core.robots.boards.BoardRobotFluidCarrierNBT; -import buildcraft.core.robots.boards.BoardRobotHarvesterNBT; -import buildcraft.core.robots.boards.BoardRobotKnightNBT; -import buildcraft.core.robots.boards.BoardRobotLeaveCutterNBT; -import buildcraft.core.robots.boards.BoardRobotLumberjackNBT; -import buildcraft.core.robots.boards.BoardRobotMinerNBT; -import buildcraft.core.robots.boards.BoardRobotPickerNBT; -import buildcraft.core.robots.boards.BoardRobotPlanterNBT; -import buildcraft.core.robots.boards.BoardRobotPumpNBT; -import buildcraft.core.robots.boards.BoardRobotShovelmanNBT; +import buildcraft.robots.RobotIntegrationRecipe; +import buildcraft.robots.boards.BoardRobotBomberNBT; +import buildcraft.robots.boards.BoardRobotBuilderNBT; +import buildcraft.robots.boards.BoardRobotButcherNBT; +import buildcraft.robots.boards.BoardRobotCarrierNBT; +import buildcraft.robots.boards.BoardRobotCrafterNBT; +import buildcraft.robots.boards.BoardRobotDeliveryNBT; +import buildcraft.robots.boards.BoardRobotFarmerNBT; +import buildcraft.robots.boards.BoardRobotFluidCarrierNBT; +import buildcraft.robots.boards.BoardRobotHarvesterNBT; +import buildcraft.robots.boards.BoardRobotKnightNBT; +import buildcraft.robots.boards.BoardRobotLeaveCutterNBT; +import buildcraft.robots.boards.BoardRobotLumberjackNBT; +import buildcraft.robots.boards.BoardRobotMinerNBT; +import buildcraft.robots.boards.BoardRobotPickerNBT; +import buildcraft.robots.boards.BoardRobotPlanterNBT; +import buildcraft.robots.boards.BoardRobotPumpNBT; +import buildcraft.robots.boards.BoardRobotShovelmanNBT; import buildcraft.silicon.BlockLaser; import buildcraft.silicon.BlockLaserTable; import buildcraft.silicon.GuiHandler; @@ -80,22 +80,22 @@ import buildcraft.silicon.TileLaser; import buildcraft.silicon.boards.BoardRecipe; import buildcraft.silicon.boards.ImplRedstoneBoardRegistry; import buildcraft.silicon.network.PacketHandlerSilicon; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionRobotGotoStation; -import buildcraft.silicon.statements.ActionRobotWakeUp; -import buildcraft.silicon.statements.ActionRobotWorkInArea; -import buildcraft.silicon.statements.ActionStationAcceptFluids; -import buildcraft.silicon.statements.ActionStationAcceptItemsInv; -import buildcraft.silicon.statements.ActionStationAcceptItemsPipe; -import buildcraft.silicon.statements.ActionStationAllowCraft; -import buildcraft.silicon.statements.ActionStationForbidRobot; -import buildcraft.silicon.statements.ActionStationProvideFluids; -import buildcraft.silicon.statements.ActionStationProvideItems; -import buildcraft.silicon.statements.ActionStationRequestItems; -import buildcraft.silicon.statements.ActionStationRequestItemsMachine; -import buildcraft.silicon.statements.RobotsActionProvider; -import buildcraft.silicon.statements.RobotsTriggerProvider; -import buildcraft.silicon.statements.TriggerRobotSleep; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionRobotGotoStation; +import buildcraft.robots.statements.ActionRobotWakeUp; +import buildcraft.robots.statements.ActionRobotWorkInArea; +import buildcraft.robots.statements.ActionStationAcceptFluids; +import buildcraft.robots.statements.ActionStationAcceptItemsInv; +import buildcraft.robots.statements.ActionStationAcceptItemsPipe; +import buildcraft.robots.statements.ActionStationAllowCraft; +import buildcraft.robots.statements.ActionStationForbidRobot; +import buildcraft.robots.statements.ActionStationProvideFluids; +import buildcraft.robots.statements.ActionStationProvideItems; +import buildcraft.robots.statements.ActionStationRequestItems; +import buildcraft.robots.statements.ActionStationRequestItemsMachine; +import buildcraft.robots.statements.RobotsActionProvider; +import buildcraft.robots.statements.RobotsTriggerProvider; +import buildcraft.robots.statements.TriggerRobotSleep; @Mod(name = "BuildCraft Silicon", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Silicon", dependencies = DefaultProps.DEPENDENCY_TRANSPORT) public class BuildCraftSilicon extends BuildCraftMod { diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index e941deb8..827e8758 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -120,10 +120,10 @@ import buildcraft.transport.pipes.PipePowerWood; import buildcraft.transport.pipes.PipeStructureCobblestone; import buildcraft.transport.pluggable.ItemLens; import buildcraft.transport.pluggable.ItemPlug; -import buildcraft.transport.pluggable.ItemRobotStation; +import buildcraft.robots.ItemRobotStation; import buildcraft.transport.pluggable.LensPluggable; import buildcraft.transport.pluggable.PlugPluggable; -import buildcraft.transport.pluggable.RobotStationPluggable; +import buildcraft.robots.RobotStationPluggable; import buildcraft.transport.recipes.AdvancedFacadeRecipe; import buildcraft.transport.recipes.GateExpansionRecipe; import buildcraft.transport.recipes.GateLogicSwapRecipe; diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index f87c2996..7afe5183 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -64,8 +64,8 @@ import buildcraft.core.inventory.Transactor; import buildcraft.core.network.BuildCraftPacket; import buildcraft.core.network.CommandWriter; import buildcraft.core.network.PacketCommand; -import buildcraft.core.robots.ResourceIdRequest; -import buildcraft.core.robots.RobotRegistry; +import buildcraft.robots.ResourceIdRequest; +import buildcraft.robots.RobotRegistry; import buildcraft.core.utils.Utils; public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluidHandler, IRequestProvider, IControllable { diff --git a/common/buildcraft/commander/TileRequester.java b/common/buildcraft/commander/TileRequester.java index e7bdc72a..5d1c0384 100755 --- a/common/buildcraft/commander/TileRequester.java +++ b/common/buildcraft/commander/TileRequester.java @@ -27,8 +27,8 @@ import buildcraft.core.inventory.StackHelper; import buildcraft.core.network.CommandWriter; import buildcraft.core.network.ICommandReceiver; import buildcraft.core.network.PacketCommand; -import buildcraft.core.robots.ResourceIdRequest; -import buildcraft.core.robots.RobotRegistry; +import buildcraft.robots.ResourceIdRequest; +import buildcraft.robots.RobotRegistry; import buildcraft.core.utils.Utils; public class TileRequester extends TileBuildCraft implements IInventory, IRequestProvider, ICommandReceiver { diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index d4f41a73..32884cd4 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -34,10 +34,10 @@ import buildcraft.BuildCraftSilicon; import buildcraft.core.EntityBlock; import buildcraft.core.LaserKind; import buildcraft.core.render.RenderEntityBlock; -import buildcraft.core.render.RenderRobot; +import buildcraft.robots.render.RenderRobot; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingMarkers; -import buildcraft.core.robots.EntityRobot; +import buildcraft.robots.EntityRobot; import buildcraft.transport.render.TileEntityPickupFX; public class CoreProxyClient extends CoreProxy { diff --git a/common/buildcraft/core/robots/IBlockFilter.java b/common/buildcraft/core/utils/IBlockFilter.java similarity index 93% rename from common/buildcraft/core/robots/IBlockFilter.java rename to common/buildcraft/core/utils/IBlockFilter.java index 7232ece5..eddc33f7 100755 --- a/common/buildcraft/core/robots/IBlockFilter.java +++ b/common/buildcraft/core/utils/IBlockFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.core.utils; import net.minecraft.world.World; diff --git a/common/buildcraft/core/robots/IEntityFilter.java b/common/buildcraft/core/utils/IEntityFilter.java similarity index 92% rename from common/buildcraft/core/robots/IEntityFilter.java rename to common/buildcraft/core/utils/IEntityFilter.java index ec8cc972..ee6352ce 100755 --- a/common/buildcraft/core/robots/IEntityFilter.java +++ b/common/buildcraft/core/utils/IEntityFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.core.utils; import net.minecraft.entity.Entity; diff --git a/common/buildcraft/core/utils/PathFinding.java b/common/buildcraft/core/utils/PathFinding.java index 43c8c1e7..961f8402 100755 --- a/common/buildcraft/core/utils/PathFinding.java +++ b/common/buildcraft/core/utils/PathFinding.java @@ -17,7 +17,6 @@ import net.minecraft.world.World; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IZone; -import buildcraft.core.robots.IBlockFilter; /** * This class implements a 3D path finding based on the A* algorithm, following diff --git a/common/buildcraft/core/robots/DockingStation.java b/common/buildcraft/robots/DockingStation.java similarity index 99% rename from common/buildcraft/core/robots/DockingStation.java rename to common/buildcraft/robots/DockingStation.java index 388cea55..7748ed83 100755 --- a/common/buildcraft/core/robots/DockingStation.java +++ b/common/buildcraft/robots/DockingStation.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/common/buildcraft/core/robots/EntityRobot.java b/common/buildcraft/robots/EntityRobot.java similarity index 99% rename from common/buildcraft/core/robots/EntityRobot.java rename to common/buildcraft/robots/EntityRobot.java index 7ad9c2ed..b5b48692 100644 --- a/common/buildcraft/core/robots/EntityRobot.java +++ b/common/buildcraft/robots/EntityRobot.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; import java.util.Date; import java.util.WeakHashMap; @@ -61,7 +61,8 @@ import buildcraft.core.network.ICommandReceiver; import buildcraft.core.network.PacketCommand; import buildcraft.core.utils.NBTUtils; import buildcraft.core.utils.Utils; -import buildcraft.silicon.statements.ActionRobotWorkInArea; +import buildcraft.robots.ai.AIRobotMain; +import buildcraft.robots.statements.ActionRobotWorkInArea; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; @@ -321,7 +322,7 @@ public class EntityRobot extends EntityRobotBase implements } @SideOnly(Side.CLIENT) private void spawnEnergyFX() { - Minecraft.getMinecraft().effectRenderer.addEffect(new EntityRobotEnergyFX( + Minecraft.getMinecraft().effectRenderer.addEffect(new EntityRobotEnergyParticle( worldObj, posX + steamDx * 0.25, posY + steamDy * 0.25, posZ + steamDz * 0.25, steamDx * 0.05, steamDy * 0.05, steamDz * 0.05, @@ -941,6 +942,7 @@ public class EntityRobot extends EntityRobotBase implements ItemStack robotStack = new ItemStack (BuildCraftSilicon.robotItem); NBTUtils.getItemData(robotStack).setTag("board", originalBoardNBT); + NBTUtils.getItemData(robotStack).setInteger("energy", battery.getEnergyStored()); entityDropItem(robotStack, 0); getRegistry().killRobot(this); diff --git a/common/buildcraft/core/robots/EntityRobotEnergyFX.java b/common/buildcraft/robots/EntityRobotEnergyParticle.java similarity index 86% rename from common/buildcraft/core/robots/EntityRobotEnergyFX.java rename to common/buildcraft/robots/EntityRobotEnergyParticle.java index 461fe779..015d25b3 100755 --- a/common/buildcraft/core/robots/EntityRobotEnergyFX.java +++ b/common/buildcraft/robots/EntityRobotEnergyParticle.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -16,18 +16,18 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class EntityRobotEnergyFX extends EntityFX { +public class EntityRobotEnergyParticle extends EntityFX { private float smokeParticleScale; - public EntityRobotEnergyFX(World world, double x, double y, double z, - double vx, - double vy, double vz) { + public EntityRobotEnergyParticle(World world, double x, double y, double z, + double vx, + double vy, double vz) { this(world, x, y, z, vx, vy, vz, 1.0F); } - public EntityRobotEnergyFX(World world, double x, double y, double z, - double vx, - double vy, double vz, float size) { + public EntityRobotEnergyParticle(World world, double x, double y, double z, + double vx, + double vy, double vz, float size) { super(world, x, y, z, vx, vy, vz); this.motionX *= 0.10000000149011612D; this.motionY *= 0.10000000149011612D; diff --git a/common/buildcraft/core/robots/IStationFilter.java b/common/buildcraft/robots/IStationFilter.java similarity index 92% rename from common/buildcraft/core/robots/IStationFilter.java rename to common/buildcraft/robots/IStationFilter.java index c0d970c3..177b583f 100755 --- a/common/buildcraft/core/robots/IStationFilter.java +++ b/common/buildcraft/robots/IStationFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; public interface IStationFilter { diff --git a/common/buildcraft/core/ItemRobot.java b/common/buildcraft/robots/ItemRobot.java similarity index 65% rename from common/buildcraft/core/ItemRobot.java rename to common/buildcraft/robots/ItemRobot.java index 0b7c3042..acd6fcb0 100755 --- a/common/buildcraft/core/ItemRobot.java +++ b/common/buildcraft/robots/ItemRobot.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core; +package buildcraft.robots; import java.util.List; @@ -22,14 +22,18 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import cofh.api.energy.IEnergyContainerItem; import buildcraft.BuildCraftSilicon; import buildcraft.api.boards.RedstoneBoardNBT; import buildcraft.api.boards.RedstoneBoardRegistry; import buildcraft.api.boards.RedstoneBoardRobotNBT; -import buildcraft.core.robots.EntityRobot; +import buildcraft.api.robots.EntityRobotBase; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.core.ItemBuildCraft; +import buildcraft.robots.EntityRobot; import buildcraft.core.utils.NBTUtils; -public class ItemRobot extends ItemBuildCraft { +public class ItemRobot extends ItemBuildCraft implements IEnergyContainerItem { public ItemRobot() { super(CreativeTabBuildCraft.BOARDS); @@ -41,6 +45,7 @@ public class ItemRobot extends ItemBuildCraft { NBTTagCompound boardCpt = nbt.getCompoundTag("board"); EntityRobot robot = new EntityRobot(world, boardCpt); + robot.getBattery().setEnergy(nbt.getInteger("energy")); return robot; } catch (Throwable e) { @@ -89,6 +94,9 @@ public class ItemRobot extends ItemBuildCraft { nbt.addInformation(stack, player, list, advanced); } } + + int energy = NBTUtils.getItemData(stack).getInteger("energy"); + list.add(energy + "/" + EntityRobotBase.MAX_ENERGY + " RF"); } @Override @@ -96,9 +104,10 @@ public class ItemRobot extends ItemBuildCraft { // cancels default BC icon registering } - public static ItemStack createRobotStack(ItemStack board) { + public static ItemStack createRobotStack(ItemStack board, int energy) { ItemStack robot = new ItemStack(BuildCraftSilicon.robotItem); NBTUtils.getItemData(robot).setTag("board", NBTUtils.getItemData(board)); + NBTUtils.getItemData(robot).setInteger("energy", energy); return robot; } @@ -114,9 +123,41 @@ public class ItemRobot extends ItemBuildCraft { NBTTagCompound nbtData = NBTUtils.getItemData(boardStack); nbt.createBoard(nbtData); - ItemStack robotStack = createRobotStack(boardStack); + ItemStack robotStack = createRobotStack(boardStack, 0); + itemList.add(robotStack.copy()); + robotStack = createRobotStack(boardStack, EntityRobotBase.MAX_ENERGY); itemList.add(robotStack.copy()); } } + + @Override + public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + int currentEnergy = container.getTagCompound().getInteger("energy"); + int energyReceived = Math.min(EntityRobotBase.MAX_ENERGY - currentEnergy, maxReceive); + if (!simulate) { + container.getTagCompound().setInteger("energy", currentEnergy + energyReceived); + } + return energyReceived; + } + + @Override + public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + int currentEnergy = container.getTagCompound().getInteger("energy"); + int energyExtracted = Math.min(currentEnergy, maxExtract); + if (!simulate) { + container.getTagCompound().setInteger("energy", currentEnergy - energyExtracted); + } + return energyExtracted; + } + + @Override + public int getEnergyStored(ItemStack container) { + return container.getTagCompound().getInteger("energy"); + } + + @Override + public int getMaxEnergyStored(ItemStack container) { + return EntityRobotBase.MAX_ENERGY; + } } diff --git a/common/buildcraft/transport/pluggable/ItemRobotStation.java b/common/buildcraft/robots/ItemRobotStation.java similarity index 97% rename from common/buildcraft/transport/pluggable/ItemRobotStation.java rename to common/buildcraft/robots/ItemRobotStation.java index c7b9b6ab..d84e6334 100755 --- a/common/buildcraft/transport/pluggable/ItemRobotStation.java +++ b/common/buildcraft/robots/ItemRobotStation.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.transport.pluggable; +package buildcraft.robots; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/buildcraft/core/robots/ResourceIdAssemblyTable.java b/common/buildcraft/robots/ResourceIdAssemblyTable.java similarity index 95% rename from common/buildcraft/core/robots/ResourceIdAssemblyTable.java rename to common/buildcraft/robots/ResourceIdAssemblyTable.java index 43b082a6..cd38c07c 100755 --- a/common/buildcraft/core/robots/ResourceIdAssemblyTable.java +++ b/common/buildcraft/robots/ResourceIdAssemblyTable.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.ResourceId; diff --git a/common/buildcraft/core/robots/ResourceIdBlock.java b/common/buildcraft/robots/ResourceIdBlock.java similarity index 95% rename from common/buildcraft/core/robots/ResourceIdBlock.java rename to common/buildcraft/robots/ResourceIdBlock.java index a6ca2ca6..4825830b 100755 --- a/common/buildcraft/core/robots/ResourceIdBlock.java +++ b/common/buildcraft/robots/ResourceIdBlock.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/core/robots/ResourceIdRequest.java b/common/buildcraft/robots/ResourceIdRequest.java similarity index 95% rename from common/buildcraft/core/robots/ResourceIdRequest.java rename to common/buildcraft/robots/ResourceIdRequest.java index 3770028d..66e8e2d0 100755 --- a/common/buildcraft/core/robots/ResourceIdRequest.java +++ b/common/buildcraft/robots/ResourceIdRequest.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; import net.minecraft.tileentity.TileEntity; diff --git a/common/buildcraft/core/robots/RobotIntegrationRecipe.java b/common/buildcraft/robots/RobotIntegrationRecipe.java similarity index 91% rename from common/buildcraft/core/robots/RobotIntegrationRecipe.java rename to common/buildcraft/robots/RobotIntegrationRecipe.java index b92c29aa..821617ff 100755 --- a/common/buildcraft/core/robots/RobotIntegrationRecipe.java +++ b/common/buildcraft/robots/RobotIntegrationRecipe.java @@ -6,13 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; import net.minecraft.item.ItemStack; import buildcraft.BuildCraftSilicon; import buildcraft.api.recipes.CraftingResult; -import buildcraft.core.ItemRobot; +import buildcraft.robots.ItemRobot; import buildcraft.silicon.ItemRedstoneBoard; import buildcraft.silicon.TileIntegrationTable; import buildcraft.transport.recipes.IntegrationTableRecipe; @@ -39,7 +39,7 @@ public class RobotIntegrationRecipe extends IntegrationTableRecipe { CraftingResult result = super.craft(crafter, preview, inputA, inputB); if (result != null) { - result.crafted = ItemRobot.createRobotStack(inputB); + result.crafted = ItemRobot.createRobotStack(inputB, 0); return result; } else { diff --git a/common/buildcraft/core/robots/RobotRegistry.java b/common/buildcraft/robots/RobotRegistry.java similarity index 99% rename from common/buildcraft/core/robots/RobotRegistry.java rename to common/buildcraft/robots/RobotRegistry.java index f240d99e..73873e12 100755 --- a/common/buildcraft/core/robots/RobotRegistry.java +++ b/common/buildcraft/robots/RobotRegistry.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; import java.security.InvalidParameterException; import java.util.ArrayList; diff --git a/common/buildcraft/transport/pluggable/RobotStationPluggable.java b/common/buildcraft/robots/RobotStationPluggable.java similarity index 98% rename from common/buildcraft/transport/pluggable/RobotStationPluggable.java rename to common/buildcraft/robots/RobotStationPluggable.java index 63b10b2c..42ce289c 100644 --- a/common/buildcraft/transport/pluggable/RobotStationPluggable.java +++ b/common/buildcraft/robots/RobotStationPluggable.java @@ -1,4 +1,4 @@ -package buildcraft.transport.pluggable; +package buildcraft.robots; import io.netty.buffer.ByteBuf; @@ -16,8 +16,6 @@ import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.pluggable.IPipePluggableItem; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.RobotRegistry; import buildcraft.core.utils.MatrixTranformations; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/core/robots/StationIndex.java b/common/buildcraft/robots/StationIndex.java similarity index 97% rename from common/buildcraft/core/robots/StationIndex.java rename to common/buildcraft/robots/StationIndex.java index b390ab61..a704555a 100755 --- a/common/buildcraft/core/robots/StationIndex.java +++ b/common/buildcraft/robots/StationIndex.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/buildcraft/core/robots/AIRobotAttack.java b/common/buildcraft/robots/ai/AIRobotAttack.java similarity index 96% rename from common/buildcraft/core/robots/AIRobotAttack.java rename to common/buildcraft/robots/ai/AIRobotAttack.java index ff4c251a..05f5381c 100755 --- a/common/buildcraft/core/robots/AIRobotAttack.java +++ b/common/buildcraft/robots/ai/AIRobotAttack.java @@ -6,12 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.entity.Entity; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.robots.EntityRobot; public class AIRobotAttack extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotBreak.java b/common/buildcraft/robots/ai/AIRobotBreak.java similarity index 99% rename from common/buildcraft/core/robots/AIRobotBreak.java rename to common/buildcraft/robots/ai/AIRobotBreak.java index bb4e53e3..06966aa2 100644 --- a/common/buildcraft/core/robots/AIRobotBreak.java +++ b/common/buildcraft/robots/ai/AIRobotBreak.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/common/buildcraft/core/robots/AIRobotCraftAssemblyTable.java b/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java similarity index 95% rename from common/buildcraft/core/robots/AIRobotCraftAssemblyTable.java rename to common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java index 6e80f5ba..56c8745c 100755 --- a/common/buildcraft/core/robots/AIRobotCraftAssemblyTable.java +++ b/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import java.util.ArrayList; @@ -29,10 +29,15 @@ import buildcraft.core.inventory.StackHelper; import buildcraft.core.inventory.Transactor; import buildcraft.core.inventory.filters.ArrayStackFilter; import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.ResourceIdAssemblyTable; +import buildcraft.robots.ResourceIdBlock; +import buildcraft.robots.RobotRegistry; import buildcraft.silicon.BlockLaserTable; import buildcraft.silicon.TileAssemblyTable; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationAllowCraft; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationAllowCraft; public class AIRobotCraftAssemblyTable extends AIRobotCraftGeneric { diff --git a/common/buildcraft/core/robots/AIRobotCraftFurnace.java b/common/buildcraft/robots/ai/AIRobotCraftFurnace.java similarity index 95% rename from common/buildcraft/core/robots/AIRobotCraftFurnace.java rename to common/buildcraft/robots/ai/AIRobotCraftFurnace.java index d3e2800b..fe71c65a 100755 --- a/common/buildcraft/core/robots/AIRobotCraftFurnace.java +++ b/common/buildcraft/robots/ai/AIRobotCraftFurnace.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.block.Block; import net.minecraft.block.BlockFurnace; @@ -25,8 +25,11 @@ import buildcraft.core.inventory.StackHelper; import buildcraft.core.inventory.Transactor; import buildcraft.core.inventory.filters.ArrayStackFilter; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationAllowCraft; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.ResourceIdBlock; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationAllowCraft; public class AIRobotCraftFurnace extends AIRobotCraftGeneric { diff --git a/common/buildcraft/core/robots/AIRobotCraftGeneric.java b/common/buildcraft/robots/ai/AIRobotCraftGeneric.java similarity index 96% rename from common/buildcraft/core/robots/AIRobotCraftGeneric.java rename to common/buildcraft/robots/ai/AIRobotCraftGeneric.java index 297aaf49..11cf82d8 100755 --- a/common/buildcraft/core/robots/AIRobotCraftGeneric.java +++ b/common/buildcraft/robots/ai/AIRobotCraftGeneric.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import java.util.ArrayList; diff --git a/common/buildcraft/core/robots/AIRobotCraftWorkbench.java b/common/buildcraft/robots/ai/AIRobotCraftWorkbench.java similarity index 96% rename from common/buildcraft/core/robots/AIRobotCraftWorkbench.java rename to common/buildcraft/robots/ai/AIRobotCraftWorkbench.java index 7e926e29..3a358e4c 100755 --- a/common/buildcraft/core/robots/AIRobotCraftWorkbench.java +++ b/common/buildcraft/robots/ai/AIRobotCraftWorkbench.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import java.util.ArrayList; @@ -35,8 +35,10 @@ import buildcraft.core.inventory.Transactor; import buildcraft.core.inventory.filters.ArrayStackFilter; import buildcraft.core.inventory.filters.ArrayStackOrListFilter; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationAllowCraft; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationAllowCraft; public class AIRobotCraftWorkbench extends AIRobotCraftGeneric { diff --git a/common/buildcraft/core/robots/AIRobotDeliverRequested.java b/common/buildcraft/robots/ai/AIRobotDeliverRequested.java similarity index 93% rename from common/buildcraft/core/robots/AIRobotDeliverRequested.java rename to common/buildcraft/robots/ai/AIRobotDeliverRequested.java index cb5ede97..5b33827c 100755 --- a/common/buildcraft/core/robots/AIRobotDeliverRequested.java +++ b/common/buildcraft/robots/ai/AIRobotDeliverRequested.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.item.ItemStack; @@ -18,7 +18,9 @@ import buildcraft.api.robots.IRequestProvider; import buildcraft.api.robots.StackRequest; import buildcraft.core.inventory.InvUtils; import buildcraft.core.inventory.filters.ArrayStackOrListFilter; -import buildcraft.silicon.statements.ActionStationRequestItemsMachine; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.statements.ActionStationRequestItemsMachine; import buildcraft.transport.Pipe; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/core/robots/AIRobotDisposeItems.java b/common/buildcraft/robots/ai/AIRobotDisposeItems.java similarity index 97% rename from common/buildcraft/core/robots/AIRobotDisposeItems.java rename to common/buildcraft/robots/ai/AIRobotDisposeItems.java index 15bf9bd7..e6c1c03b 100755 --- a/common/buildcraft/core/robots/AIRobotDisposeItems.java +++ b/common/buildcraft/robots/ai/AIRobotDisposeItems.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.entity.item.EntityItem; diff --git a/common/buildcraft/core/robots/AIRobotFetchAndEquipItemStack.java b/common/buildcraft/robots/ai/AIRobotFetchAndEquipItemStack.java similarity index 96% rename from common/buildcraft/core/robots/AIRobotFetchAndEquipItemStack.java rename to common/buildcraft/robots/ai/AIRobotFetchAndEquipItemStack.java index 0191a48a..2143b302 100755 --- a/common/buildcraft/core/robots/AIRobotFetchAndEquipItemStack.java +++ b/common/buildcraft/robots/ai/AIRobotFetchAndEquipItemStack.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -19,6 +19,7 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.robots.DockingStation; public class AIRobotFetchAndEquipItemStack extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotFetchItem.java b/common/buildcraft/robots/ai/AIRobotFetchItem.java similarity index 97% rename from common/buildcraft/core/robots/AIRobotFetchItem.java rename to common/buildcraft/robots/ai/AIRobotFetchItem.java index 57610d46..6cf9f6e2 100755 --- a/common/buildcraft/core/robots/AIRobotFetchItem.java +++ b/common/buildcraft/robots/ai/AIRobotFetchItem.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -18,7 +18,7 @@ import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.TransactorSimple; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.robots.boards.BoardRobotPicker; +import buildcraft.robots.boards.BoardRobotPicker; public class AIRobotFetchItem extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotGoAndLinkToDock.java b/common/buildcraft/robots/ai/AIRobotGoAndLinkToDock.java similarity index 95% rename from common/buildcraft/core/robots/AIRobotGoAndLinkToDock.java rename to common/buildcraft/robots/ai/AIRobotGoAndLinkToDock.java index e4a56735..fcc405d4 100755 --- a/common/buildcraft/core/robots/AIRobotGoAndLinkToDock.java +++ b/common/buildcraft/robots/ai/AIRobotGoAndLinkToDock.java @@ -6,10 +6,11 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.robots.DockingStation; public class AIRobotGoAndLinkToDock extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotGoto.java b/common/buildcraft/robots/ai/AIRobotGoto.java similarity index 97% rename from common/buildcraft/core/robots/AIRobotGoto.java rename to common/buildcraft/robots/ai/AIRobotGoto.java index 38e199f7..49abd9d3 100755 --- a/common/buildcraft/core/robots/AIRobotGoto.java +++ b/common/buildcraft/robots/ai/AIRobotGoto.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/core/robots/AIRobotGotoBlock.java b/common/buildcraft/robots/ai/AIRobotGotoBlock.java similarity index 99% rename from common/buildcraft/core/robots/AIRobotGotoBlock.java rename to common/buildcraft/robots/ai/AIRobotGotoBlock.java index 26f54cfb..1ec5f66e 100755 --- a/common/buildcraft/core/robots/AIRobotGotoBlock.java +++ b/common/buildcraft/robots/ai/AIRobotGotoBlock.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import java.util.LinkedList; diff --git a/common/buildcraft/core/robots/AIRobotGotoRandomGroundBlock.java b/common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java similarity index 96% rename from common/buildcraft/core/robots/AIRobotGotoRandomGroundBlock.java rename to common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java index 7b4d75b0..2b364cac 100755 --- a/common/buildcraft/core/robots/AIRobotGotoRandomGroundBlock.java +++ b/common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import java.util.LinkedList; @@ -14,6 +14,7 @@ import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.core.utils.IBlockFilter; import buildcraft.core.utils.PathFinding; import buildcraft.core.utils.PathFindingJob; diff --git a/common/buildcraft/core/robots/AIRobotGotoSleep.java b/common/buildcraft/robots/ai/AIRobotGotoSleep.java similarity index 96% rename from common/buildcraft/core/robots/AIRobotGotoSleep.java rename to common/buildcraft/robots/ai/AIRobotGotoSleep.java index a918a9ac..e77e7998 100755 --- a/common/buildcraft/core/robots/AIRobotGotoSleep.java +++ b/common/buildcraft/robots/ai/AIRobotGotoSleep.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/core/robots/AIRobotGotoStation.java b/common/buildcraft/robots/ai/AIRobotGotoStation.java similarity index 97% rename from common/buildcraft/core/robots/AIRobotGotoStation.java rename to common/buildcraft/robots/ai/AIRobotGotoStation.java index 8dd99ce6..c3f46c0d 100755 --- a/common/buildcraft/core/robots/AIRobotGotoStation.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStation.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.nbt.NBTTagCompound; @@ -16,6 +16,7 @@ import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IDockingStation; +import buildcraft.robots.DockingStation; public class AIRobotGotoStation extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotGotoStationAndLoad.java b/common/buildcraft/robots/ai/AIRobotGotoStationAndLoad.java similarity index 97% rename from common/buildcraft/core/robots/AIRobotGotoStationAndLoad.java rename to common/buildcraft/robots/ai/AIRobotGotoStationAndLoad.java index 73147daa..8b279436 100755 --- a/common/buildcraft/core/robots/AIRobotGotoStationAndLoad.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationAndLoad.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/core/robots/AIRobotGotoStationAndLoadFluids.java b/common/buildcraft/robots/ai/AIRobotGotoStationAndLoadFluids.java similarity index 97% rename from common/buildcraft/core/robots/AIRobotGotoStationAndLoadFluids.java rename to common/buildcraft/robots/ai/AIRobotGotoStationAndLoadFluids.java index d46d06aa..de297acc 100755 --- a/common/buildcraft/core/robots/AIRobotGotoStationAndLoadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationAndLoadFluids.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/core/robots/AIRobotGotoStationAndUnload.java b/common/buildcraft/robots/ai/AIRobotGotoStationAndUnload.java similarity index 95% rename from common/buildcraft/core/robots/AIRobotGotoStationAndUnload.java rename to common/buildcraft/robots/ai/AIRobotGotoStationAndUnload.java index e00feeca..ac2d83ca 100755 --- a/common/buildcraft/core/robots/AIRobotGotoStationAndUnload.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationAndUnload.java @@ -6,11 +6,12 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.robots.DockingStation; public class AIRobotGotoStationAndUnload extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotGotoStationAndUnloadFluids.java b/common/buildcraft/robots/ai/AIRobotGotoStationAndUnloadFluids.java similarity index 97% rename from common/buildcraft/core/robots/AIRobotGotoStationAndUnloadFluids.java rename to common/buildcraft/robots/ai/AIRobotGotoStationAndUnloadFluids.java index a89ddedd..aebedf62 100755 --- a/common/buildcraft/core/robots/AIRobotGotoStationAndUnloadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationAndUnloadFluids.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; diff --git a/common/buildcraft/core/robots/AIRobotGotoStationToLoad.java b/common/buildcraft/robots/ai/AIRobotGotoStationToLoad.java similarity index 90% rename from common/buildcraft/core/robots/AIRobotGotoStationToLoad.java rename to common/buildcraft/robots/ai/AIRobotGotoStationToLoad.java index a7f91dd6..34e795ba 100755 --- a/common/buildcraft/core/robots/AIRobotGotoStationToLoad.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationToLoad.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; @@ -19,8 +19,10 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationProvideItems; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationProvideItems; public class AIRobotGotoStationToLoad extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotGotoStationToLoadFluids.java b/common/buildcraft/robots/ai/AIRobotGotoStationToLoadFluids.java similarity index 91% rename from common/buildcraft/core/robots/AIRobotGotoStationToLoadFluids.java rename to common/buildcraft/robots/ai/AIRobotGotoStationToLoadFluids.java index 5f33694e..113a0f73 100755 --- a/common/buildcraft/core/robots/AIRobotGotoStationToLoadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationToLoadFluids.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.tileentity.TileEntity; @@ -18,8 +18,10 @@ import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IFluidFilter; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationProvideFluids; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationProvideFluids; public class AIRobotGotoStationToLoadFluids extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotGotoStationToUnload.java b/common/buildcraft/robots/ai/AIRobotGotoStationToUnload.java similarity index 90% rename from common/buildcraft/core/robots/AIRobotGotoStationToUnload.java rename to common/buildcraft/robots/ai/AIRobotGotoStationToUnload.java index a2b091a4..de07cf57 100755 --- a/common/buildcraft/core/robots/AIRobotGotoStationToUnload.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationToUnload.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraftforge.common.util.ForgeDirection; @@ -15,7 +15,10 @@ import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.InventoryIterator; -import buildcraft.silicon.statements.ActionStationInputItems; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.statements.ActionStationInputItems; import buildcraft.transport.Pipe; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/core/robots/AIRobotGotoStationToUnloadFluids.java b/common/buildcraft/robots/ai/AIRobotGotoStationToUnloadFluids.java similarity index 90% rename from common/buildcraft/core/robots/AIRobotGotoStationToUnloadFluids.java rename to common/buildcraft/robots/ai/AIRobotGotoStationToUnloadFluids.java index d9717465..30dc892e 100755 --- a/common/buildcraft/core/robots/AIRobotGotoStationToUnloadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationToUnloadFluids.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.tileentity.TileEntity; @@ -18,8 +18,10 @@ import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.SimpleFluidFilter; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationAcceptFluids; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationAcceptFluids; public class AIRobotGotoStationToUnloadFluids extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotLoad.java b/common/buildcraft/robots/ai/AIRobotLoad.java similarity index 94% rename from common/buildcraft/core/robots/AIRobotLoad.java rename to common/buildcraft/robots/ai/AIRobotLoad.java index ab77ba25..1a49bb03 100755 --- a/common/buildcraft/core/robots/AIRobotLoad.java +++ b/common/buildcraft/robots/ai/AIRobotLoad.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -21,8 +21,9 @@ import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.InventoryIterator; import buildcraft.core.inventory.Transactor; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationProvideItems; +import buildcraft.robots.DockingStation; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationProvideItems; public class AIRobotLoad extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotLoadFluids.java b/common/buildcraft/robots/ai/AIRobotLoadFluids.java similarity index 92% rename from common/buildcraft/core/robots/AIRobotLoadFluids.java rename to common/buildcraft/robots/ai/AIRobotLoadFluids.java index f0670a77..a0e38d5d 100755 --- a/common/buildcraft/core/robots/AIRobotLoadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotLoadFluids.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.tileentity.TileEntity; @@ -18,8 +18,9 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IFluidFilter; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationProvideFluids; +import buildcraft.robots.DockingStation; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationProvideFluids; public class AIRobotLoadFluids extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotMain.java b/common/buildcraft/robots/ai/AIRobotMain.java similarity index 97% rename from common/buildcraft/core/robots/AIRobotMain.java rename to common/buildcraft/robots/ai/AIRobotMain.java index 071114b3..4ab9b27d 100755 --- a/common/buildcraft/core/robots/AIRobotMain.java +++ b/common/buildcraft/robots/ai/AIRobotMain.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/core/robots/AIRobotPumpBlock.java b/common/buildcraft/robots/ai/AIRobotPumpBlock.java similarity index 98% rename from common/buildcraft/core/robots/AIRobotPumpBlock.java rename to common/buildcraft/robots/ai/AIRobotPumpBlock.java index 8d7b1e55..98d30685 100644 --- a/common/buildcraft/core/robots/AIRobotPumpBlock.java +++ b/common/buildcraft/robots/ai/AIRobotPumpBlock.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; diff --git a/common/buildcraft/core/robots/AIRobotRecharge.java b/common/buildcraft/robots/ai/AIRobotRecharge.java similarity index 93% rename from common/buildcraft/core/robots/AIRobotRecharge.java rename to common/buildcraft/robots/ai/AIRobotRecharge.java index 1a1940be..f2c03f70 100755 --- a/common/buildcraft/core/robots/AIRobotRecharge.java +++ b/common/buildcraft/robots/ai/AIRobotRecharge.java @@ -6,11 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.transport.IPipeTile; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; import buildcraft.transport.PipeTransportPower; public class AIRobotRecharge extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotSearchAndGotoStation.java b/common/buildcraft/robots/ai/AIRobotSearchAndGotoStation.java similarity index 91% rename from common/buildcraft/core/robots/AIRobotSearchAndGotoStation.java rename to common/buildcraft/robots/ai/AIRobotSearchAndGotoStation.java index 4611f5e8..0e0ac155 100755 --- a/common/buildcraft/core/robots/AIRobotSearchAndGotoStation.java +++ b/common/buildcraft/robots/ai/AIRobotSearchAndGotoStation.java @@ -6,11 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; public class AIRobotSearchAndGotoStation extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotSearchBlock.java b/common/buildcraft/robots/ai/AIRobotSearchBlock.java similarity index 96% rename from common/buildcraft/core/robots/AIRobotSearchBlock.java rename to common/buildcraft/robots/ai/AIRobotSearchBlock.java index a833b7c5..a2b69e5e 100755 --- a/common/buildcraft/core/robots/AIRobotSearchBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchBlock.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import java.util.LinkedList; @@ -15,6 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.core.utils.IBlockFilter; import buildcraft.core.utils.PathFinding; import buildcraft.core.utils.PathFindingJob; diff --git a/common/buildcraft/core/robots/AIRobotSearchEntity.java b/common/buildcraft/robots/ai/AIRobotSearchEntity.java similarity index 96% rename from common/buildcraft/core/robots/AIRobotSearchEntity.java rename to common/buildcraft/robots/ai/AIRobotSearchEntity.java index f5f8af6d..9672e0c4 100755 --- a/common/buildcraft/core/robots/AIRobotSearchEntity.java +++ b/common/buildcraft/robots/ai/AIRobotSearchEntity.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.entity.Entity; @@ -14,6 +14,7 @@ import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.TransactorSimple; +import buildcraft.core.utils.IEntityFilter; public class AIRobotSearchEntity extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotSearchRandomGroundBlock.java b/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java similarity index 96% rename from common/buildcraft/core/robots/AIRobotSearchRandomGroundBlock.java rename to common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java index 8e6bd18f..7e3dfb72 100755 --- a/common/buildcraft/core/robots/AIRobotSearchRandomGroundBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java @@ -6,12 +6,13 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.core.utils.IBlockFilter; public class AIRobotSearchRandomGroundBlock extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotSearchStackRequest.java b/common/buildcraft/robots/ai/AIRobotSearchStackRequest.java similarity index 93% rename from common/buildcraft/core/robots/AIRobotSearchStackRequest.java rename to common/buildcraft/robots/ai/AIRobotSearchStackRequest.java index 287ff1fb..38510e8d 100755 --- a/common/buildcraft/core/robots/AIRobotSearchStackRequest.java +++ b/common/buildcraft/robots/ai/AIRobotSearchStackRequest.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import java.util.Collection; @@ -23,9 +23,11 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.StackHelper; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationRequestItems; -import buildcraft.silicon.statements.ActionStationRequestItemsMachine; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationRequestItems; +import buildcraft.robots.statements.ActionStationRequestItemsMachine; import buildcraft.transport.Pipe; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/core/robots/AIRobotSearchStation.java b/common/buildcraft/robots/ai/AIRobotSearchStation.java similarity index 92% rename from common/buildcraft/core/robots/AIRobotSearchStation.java rename to common/buildcraft/robots/ai/AIRobotSearchStation.java index 4ee59afd..db8bbc6a 100755 --- a/common/buildcraft/core/robots/AIRobotSearchStation.java +++ b/common/buildcraft/robots/ai/AIRobotSearchStation.java @@ -6,13 +6,15 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.core.IZone; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.IDockingStation; -import buildcraft.silicon.statements.ActionStationForbidRobot; +import buildcraft.robots.DockingStation; +import buildcraft.robots.IStationFilter; +import buildcraft.robots.statements.ActionStationForbidRobot; public class AIRobotSearchStation extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotSleep.java b/common/buildcraft/robots/ai/AIRobotSleep.java similarity index 90% rename from common/buildcraft/core/robots/AIRobotSleep.java rename to common/buildcraft/robots/ai/AIRobotSleep.java index 36bb477d..810306e5 100755 --- a/common/buildcraft/core/robots/AIRobotSleep.java +++ b/common/buildcraft/robots/ai/AIRobotSleep.java @@ -6,11 +6,12 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.silicon.statements.ActionRobotWakeUp; +import buildcraft.robots.DockingStation; +import buildcraft.robots.statements.ActionRobotWakeUp; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/core/robots/AIRobotStraightMoveTo.java b/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java similarity index 97% rename from common/buildcraft/core/robots/AIRobotStraightMoveTo.java rename to common/buildcraft/robots/ai/AIRobotStraightMoveTo.java index 4d93f3fe..d08a2ca2 100755 --- a/common/buildcraft/core/robots/AIRobotStraightMoveTo.java +++ b/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import buildcraft.api.robots.EntityRobotBase; diff --git a/common/buildcraft/core/robots/AIRobotUnload.java b/common/buildcraft/robots/ai/AIRobotUnload.java similarity index 91% rename from common/buildcraft/core/robots/AIRobotUnload.java rename to common/buildcraft/robots/ai/AIRobotUnload.java index 851aafeb..218e5d00 100755 --- a/common/buildcraft/core/robots/AIRobotUnload.java +++ b/common/buildcraft/robots/ai/AIRobotUnload.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraftforge.common.util.ForgeDirection; @@ -14,7 +14,9 @@ import buildcraft.api.core.IInvSlot; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.InventoryIterator; -import buildcraft.silicon.statements.ActionStationInputItems; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; +import buildcraft.robots.statements.ActionStationInputItems; import buildcraft.transport.Pipe; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/core/robots/AIRobotUnloadFluids.java b/common/buildcraft/robots/ai/AIRobotUnloadFluids.java similarity index 92% rename from common/buildcraft/core/robots/AIRobotUnloadFluids.java rename to common/buildcraft/robots/ai/AIRobotUnloadFluids.java index c91736a4..1eabcf68 100755 --- a/common/buildcraft/core/robots/AIRobotUnloadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotUnloadFluids.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.tileentity.TileEntity; @@ -18,8 +18,9 @@ import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.SimpleFluidFilter; -import buildcraft.silicon.statements.ActionRobotFilter; -import buildcraft.silicon.statements.ActionStationAcceptFluids; +import buildcraft.robots.DockingStation; +import buildcraft.robots.statements.ActionRobotFilter; +import buildcraft.robots.statements.ActionStationAcceptFluids; public class AIRobotUnloadFluids extends AIRobot { diff --git a/common/buildcraft/core/robots/AIRobotUseToolOnBlock.java b/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java similarity index 98% rename from common/buildcraft/core/robots/AIRobotUseToolOnBlock.java rename to common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java index 57fa2667..6fae02ab 100755 --- a/common/buildcraft/core/robots/AIRobotUseToolOnBlock.java +++ b/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots; +package buildcraft.robots.ai; import net.minecraft.item.ItemStack; import net.minecraft.world.WorldServer; diff --git a/common/buildcraft/core/robots/boards/BoardRobotBomber.java b/common/buildcraft/robots/boards/BoardRobotBomber.java similarity index 90% rename from common/buildcraft/core/robots/boards/BoardRobotBomber.java rename to common/buildcraft/robots/boards/BoardRobotBomber.java index 8facf1b4..436d4571 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotBomber.java +++ b/common/buildcraft/robots/boards/BoardRobotBomber.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.Blocks; @@ -24,11 +24,11 @@ import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; import buildcraft.core.inventory.filters.ArrayStackFilter; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.robots.AIRobotGotoBlock; -import buildcraft.core.robots.AIRobotGotoStationToLoad; -import buildcraft.core.robots.AIRobotLoad; -import buildcraft.core.robots.AIRobotSearchRandomGroundBlock; -import buildcraft.core.robots.IBlockFilter; +import buildcraft.robots.ai.AIRobotGotoBlock; +import buildcraft.robots.ai.AIRobotGotoStationToLoad; +import buildcraft.robots.ai.AIRobotLoad; +import buildcraft.robots.ai.AIRobotSearchRandomGroundBlock; +import buildcraft.core.utils.IBlockFilter; public class BoardRobotBomber extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotBomberNBT.java b/common/buildcraft/robots/boards/BoardRobotBomberNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotBomberNBT.java rename to common/buildcraft/robots/boards/BoardRobotBomberNBT.java index 59346dbd..df1d3e16 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotBomberNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotBomberNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotBuilder.java b/common/buildcraft/robots/boards/BoardRobotBuilder.java similarity index 94% rename from common/buildcraft/core/robots/boards/BoardRobotBuilder.java rename to common/buildcraft/robots/boards/BoardRobotBuilder.java index 873cdbfb..bfe0116f 100644 --- a/common/buildcraft/core/robots/boards/BoardRobotBuilder.java +++ b/common/buildcraft/robots/boards/BoardRobotBuilder.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.LinkedList; @@ -21,11 +21,11 @@ import buildcraft.builders.TileConstructionMarker; import buildcraft.core.builders.BuildingItem; import buildcraft.core.builders.BuildingSlot; import buildcraft.core.inventory.filters.ArrayStackFilter; -import buildcraft.core.robots.AIRobotGotoBlock; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotGotoStationToLoad; -import buildcraft.core.robots.AIRobotLoad; -import buildcraft.core.robots.AIRobotRecharge; +import buildcraft.robots.ai.AIRobotGotoBlock; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotGotoStationToLoad; +import buildcraft.robots.ai.AIRobotLoad; +import buildcraft.robots.ai.AIRobotRecharge; public class BoardRobotBuilder extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotBuilderNBT.java b/common/buildcraft/robots/boards/BoardRobotBuilderNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotBuilderNBT.java rename to common/buildcraft/robots/boards/BoardRobotBuilderNBT.java index 92df36d1..a0f037f9 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotBuilderNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotBuilderNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotButcher.java b/common/buildcraft/robots/boards/BoardRobotButcher.java similarity index 87% rename from common/buildcraft/core/robots/boards/BoardRobotButcher.java rename to common/buildcraft/robots/boards/BoardRobotButcher.java index e1d2f9cb..61baec29 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotButcher.java +++ b/common/buildcraft/robots/boards/BoardRobotButcher.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; @@ -18,11 +18,11 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.robots.AIRobotAttack; -import buildcraft.core.robots.AIRobotFetchAndEquipItemStack; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotSearchEntity; -import buildcraft.core.robots.IEntityFilter; +import buildcraft.robots.ai.AIRobotAttack; +import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotSearchEntity; +import buildcraft.core.utils.IEntityFilter; public class BoardRobotButcher extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotButcherNBT.java b/common/buildcraft/robots/boards/BoardRobotButcherNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotButcherNBT.java rename to common/buildcraft/robots/boards/BoardRobotButcherNBT.java index 46a59e9b..893c96c9 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotButcherNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotButcherNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotCarrier.java b/common/buildcraft/robots/boards/BoardRobotCarrier.java similarity index 87% rename from common/buildcraft/core/robots/boards/BoardRobotCarrier.java rename to common/buildcraft/robots/boards/BoardRobotCarrier.java index 6267fa07..32ac8c08 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotCarrier.java +++ b/common/buildcraft/robots/boards/BoardRobotCarrier.java @@ -6,17 +6,17 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotGotoStationAndUnload; -import buildcraft.core.robots.AIRobotGotoStationToLoad; -import buildcraft.core.robots.AIRobotLoad; -import buildcraft.silicon.statements.ActionRobotFilter; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotGotoStationAndUnload; +import buildcraft.robots.ai.AIRobotGotoStationToLoad; +import buildcraft.robots.ai.AIRobotLoad; +import buildcraft.robots.statements.ActionRobotFilter; public class BoardRobotCarrier extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotCarrierNBT.java b/common/buildcraft/robots/boards/BoardRobotCarrierNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotCarrierNBT.java rename to common/buildcraft/robots/boards/BoardRobotCarrierNBT.java index 3b5f8064..4d3c470b 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotCarrierNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotCarrierNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotCrafter.java b/common/buildcraft/robots/boards/BoardRobotCrafter.java similarity index 89% rename from common/buildcraft/core/robots/boards/BoardRobotCrafter.java rename to common/buildcraft/robots/boards/BoardRobotCrafter.java index ea11709b..8d780aa7 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotCrafter.java +++ b/common/buildcraft/robots/boards/BoardRobotCrafter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.ArrayList; import java.util.HashSet; @@ -32,17 +32,17 @@ import buildcraft.api.robots.IDockingStation; import buildcraft.api.robots.StackRequest; import buildcraft.core.inventory.StackHelper; import buildcraft.core.recipes.AssemblyRecipeManager; -import buildcraft.core.robots.AIRobotCraftAssemblyTable; -import buildcraft.core.robots.AIRobotCraftFurnace; -import buildcraft.core.robots.AIRobotCraftGeneric; -import buildcraft.core.robots.AIRobotCraftWorkbench; -import buildcraft.core.robots.AIRobotDeliverRequested; -import buildcraft.core.robots.AIRobotDisposeItems; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotGotoStationToUnload; -import buildcraft.core.robots.AIRobotSearchStackRequest; -import buildcraft.core.robots.AIRobotUnload; -import buildcraft.silicon.statements.ActionRobotFilter; +import buildcraft.robots.ai.AIRobotCraftAssemblyTable; +import buildcraft.robots.ai.AIRobotCraftFurnace; +import buildcraft.robots.ai.AIRobotCraftGeneric; +import buildcraft.robots.ai.AIRobotCraftWorkbench; +import buildcraft.robots.ai.AIRobotDeliverRequested; +import buildcraft.robots.ai.AIRobotDisposeItems; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotGotoStationToUnload; +import buildcraft.robots.ai.AIRobotSearchStackRequest; +import buildcraft.robots.ai.AIRobotUnload; +import buildcraft.robots.statements.ActionRobotFilter; public class BoardRobotCrafter extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotCrafterNBT.java b/common/buildcraft/robots/boards/BoardRobotCrafterNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotCrafterNBT.java rename to common/buildcraft/robots/boards/BoardRobotCrafterNBT.java index 25ab9bef..553ca91e 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotCrafterNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotCrafterNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotDelivery.java b/common/buildcraft/robots/boards/BoardRobotDelivery.java similarity index 87% rename from common/buildcraft/core/robots/boards/BoardRobotDelivery.java rename to common/buildcraft/robots/boards/BoardRobotDelivery.java index 106b2674..196ac3e3 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotDelivery.java +++ b/common/buildcraft/robots/boards/BoardRobotDelivery.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.ArrayList; @@ -19,12 +19,12 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.robots.StackRequest; import buildcraft.core.inventory.StackHelper; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.robots.AIRobotDeliverRequested; -import buildcraft.core.robots.AIRobotDisposeItems; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotGotoStationAndLoad; -import buildcraft.core.robots.AIRobotSearchStackRequest; -import buildcraft.silicon.statements.ActionRobotFilter; +import buildcraft.robots.ai.AIRobotDeliverRequested; +import buildcraft.robots.ai.AIRobotDisposeItems; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotGotoStationAndLoad; +import buildcraft.robots.ai.AIRobotSearchStackRequest; +import buildcraft.robots.statements.ActionRobotFilter; public class BoardRobotDelivery extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotDeliveryNBT.java b/common/buildcraft/robots/boards/BoardRobotDeliveryNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotDeliveryNBT.java rename to common/buildcraft/robots/boards/BoardRobotDeliveryNBT.java index 44101d67..7bea8e89 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotDeliveryNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotDeliveryNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotFarmer.java b/common/buildcraft/robots/boards/BoardRobotFarmer.java similarity index 88% rename from common/buildcraft/core/robots/boards/BoardRobotFarmer.java rename to common/buildcraft/robots/boards/BoardRobotFarmer.java index 58ae4790..1f74889b 100644 --- a/common/buildcraft/core/robots/boards/BoardRobotFarmer.java +++ b/common/buildcraft/robots/boards/BoardRobotFarmer.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; @@ -20,14 +20,14 @@ import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.robots.AIRobotFetchAndEquipItemStack; -import buildcraft.core.robots.AIRobotGotoBlock; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotSearchBlock; -import buildcraft.core.robots.AIRobotUseToolOnBlock; -import buildcraft.core.robots.IBlockFilter; -import buildcraft.core.robots.ResourceIdBlock; -import buildcraft.core.robots.RobotRegistry; +import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; +import buildcraft.robots.ai.AIRobotGotoBlock; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotSearchBlock; +import buildcraft.robots.ai.AIRobotUseToolOnBlock; +import buildcraft.core.utils.IBlockFilter; +import buildcraft.robots.ResourceIdBlock; +import buildcraft.robots.RobotRegistry; public class BoardRobotFarmer extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotFarmerNBT.java b/common/buildcraft/robots/boards/BoardRobotFarmerNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotFarmerNBT.java rename to common/buildcraft/robots/boards/BoardRobotFarmerNBT.java index 334af7e2..5fce988e 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotFarmerNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotFarmerNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotFluidCarrier.java b/common/buildcraft/robots/boards/BoardRobotFluidCarrier.java similarity index 82% rename from common/buildcraft/core/robots/boards/BoardRobotFluidCarrier.java rename to common/buildcraft/robots/boards/BoardRobotFluidCarrier.java index 601d9f68..a0bd15f0 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotFluidCarrier.java +++ b/common/buildcraft/robots/boards/BoardRobotFluidCarrier.java @@ -6,16 +6,16 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotGotoStationAndLoadFluids; -import buildcraft.core.robots.AIRobotGotoStationAndUnloadFluids; -import buildcraft.silicon.statements.ActionRobotFilter; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotGotoStationAndLoadFluids; +import buildcraft.robots.ai.AIRobotGotoStationAndUnloadFluids; +import buildcraft.robots.statements.ActionRobotFilter; public class BoardRobotFluidCarrier extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotFluidCarrierNBT.java b/common/buildcraft/robots/boards/BoardRobotFluidCarrierNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotFluidCarrierNBT.java rename to common/buildcraft/robots/boards/BoardRobotFluidCarrierNBT.java index 50acce92..153f53f5 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotFluidCarrierNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotFluidCarrierNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java similarity index 91% rename from common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java rename to common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java index 528d38b0..f403f673 100644 --- a/common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java +++ b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.ArrayList; @@ -23,15 +23,15 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.robots.AIRobotBreak; -import buildcraft.core.robots.AIRobotFetchAndEquipItemStack; -import buildcraft.core.robots.AIRobotGotoBlock; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotSearchBlock; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.IBlockFilter; -import buildcraft.core.robots.ResourceIdBlock; -import buildcraft.silicon.statements.ActionRobotFilter; +import buildcraft.robots.ai.AIRobotBreak; +import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; +import buildcraft.robots.ai.AIRobotGotoBlock; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotSearchBlock; +import buildcraft.robots.DockingStation; +import buildcraft.core.utils.IBlockFilter; +import buildcraft.robots.ResourceIdBlock; +import buildcraft.robots.statements.ActionRobotFilter; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/core/robots/boards/BoardRobotHarvester.java b/common/buildcraft/robots/boards/BoardRobotHarvester.java similarity index 96% rename from common/buildcraft/core/robots/boards/BoardRobotHarvester.java rename to common/buildcraft/robots/boards/BoardRobotHarvester.java index cf558c5d..6fabc682 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotHarvester.java +++ b/common/buildcraft/robots/boards/BoardRobotHarvester.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/buildcraft/core/robots/boards/BoardRobotHarvesterNBT.java b/common/buildcraft/robots/boards/BoardRobotHarvesterNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotHarvesterNBT.java rename to common/buildcraft/robots/boards/BoardRobotHarvesterNBT.java index b3ff0c1a..770e6aaa 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotHarvesterNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotHarvesterNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotKnight.java b/common/buildcraft/robots/boards/BoardRobotKnight.java similarity index 87% rename from common/buildcraft/core/robots/boards/BoardRobotKnight.java rename to common/buildcraft/robots/boards/BoardRobotKnight.java index 1f153af3..bdb07bc7 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotKnight.java +++ b/common/buildcraft/robots/boards/BoardRobotKnight.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityMob; @@ -18,11 +18,11 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IStackFilter; -import buildcraft.core.robots.AIRobotAttack; -import buildcraft.core.robots.AIRobotFetchAndEquipItemStack; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotSearchEntity; -import buildcraft.core.robots.IEntityFilter; +import buildcraft.robots.ai.AIRobotAttack; +import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotSearchEntity; +import buildcraft.core.utils.IEntityFilter; public class BoardRobotKnight extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotKnightNBT.java b/common/buildcraft/robots/boards/BoardRobotKnightNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotKnightNBT.java rename to common/buildcraft/robots/boards/BoardRobotKnightNBT.java index 0552751f..3792bb71 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotKnightNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotKnightNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotLeaveCutter.java b/common/buildcraft/robots/boards/BoardRobotLeaveCutter.java similarity index 96% rename from common/buildcraft/core/robots/boards/BoardRobotLeaveCutter.java rename to common/buildcraft/robots/boards/BoardRobotLeaveCutter.java index 6915e960..e5cb4408 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotLeaveCutter.java +++ b/common/buildcraft/robots/boards/BoardRobotLeaveCutter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/robots/boards/BoardRobotLeaveCutterNBT.java b/common/buildcraft/robots/boards/BoardRobotLeaveCutterNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotLeaveCutterNBT.java rename to common/buildcraft/robots/boards/BoardRobotLeaveCutterNBT.java index ca85621d..ed3f8131 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotLeaveCutterNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotLeaveCutterNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotLumberjack.java b/common/buildcraft/robots/boards/BoardRobotLumberjack.java similarity index 96% rename from common/buildcraft/core/robots/boards/BoardRobotLumberjack.java rename to common/buildcraft/robots/boards/BoardRobotLumberjack.java index d4ad9e65..a71765a2 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotLumberjack.java +++ b/common/buildcraft/robots/boards/BoardRobotLumberjack.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/robots/boards/BoardRobotLumberjackNBT.java b/common/buildcraft/robots/boards/BoardRobotLumberjackNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotLumberjackNBT.java rename to common/buildcraft/robots/boards/BoardRobotLumberjackNBT.java index a1f91f86..010c6aca 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotLumberjackNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotLumberjackNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotMiner.java b/common/buildcraft/robots/boards/BoardRobotMiner.java similarity index 94% rename from common/buildcraft/core/robots/boards/BoardRobotMiner.java rename to common/buildcraft/robots/boards/BoardRobotMiner.java index 3c1dc44f..28149efe 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotMiner.java +++ b/common/buildcraft/robots/boards/BoardRobotMiner.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; @@ -16,7 +16,7 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.robots.AIRobotFetchAndEquipItemStack; +import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; public class BoardRobotMiner extends BoardRobotGenericBreakBlock { diff --git a/common/buildcraft/core/robots/boards/BoardRobotMinerNBT.java b/common/buildcraft/robots/boards/BoardRobotMinerNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotMinerNBT.java rename to common/buildcraft/robots/boards/BoardRobotMinerNBT.java index b32f5a96..14012f7c 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotMinerNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotMinerNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotPicker.java b/common/buildcraft/robots/boards/BoardRobotPicker.java similarity index 89% rename from common/buildcraft/core/robots/boards/BoardRobotPicker.java rename to common/buildcraft/robots/boards/BoardRobotPicker.java index c97c327a..9273c857 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotPicker.java +++ b/common/buildcraft/robots/boards/BoardRobotPicker.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.HashSet; import java.util.Set; @@ -17,10 +17,10 @@ import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.robots.AIRobotFetchItem; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotGotoStationAndUnload; -import buildcraft.silicon.statements.ActionRobotFilter; +import buildcraft.robots.ai.AIRobotFetchItem; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotGotoStationAndUnload; +import buildcraft.robots.statements.ActionRobotFilter; public class BoardRobotPicker extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotPickerNBT.java b/common/buildcraft/robots/boards/BoardRobotPickerNBT.java similarity index 95% rename from common/buildcraft/core/robots/boards/BoardRobotPickerNBT.java rename to common/buildcraft/robots/boards/BoardRobotPickerNBT.java index 52aae767..39684395 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotPickerNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotPickerNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; @@ -20,7 +20,7 @@ import net.minecraft.util.ResourceLocation; import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.robots.EntityRobot; +import buildcraft.robots.EntityRobot; import buildcraft.core.utils.StringUtils; public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/core/robots/boards/BoardRobotPlanter.java b/common/buildcraft/robots/boards/BoardRobotPlanter.java similarity index 90% rename from common/buildcraft/core/robots/boards/BoardRobotPlanter.java rename to common/buildcraft/robots/boards/BoardRobotPlanter.java index b30dab13..299ca2ac 100644 --- a/common/buildcraft/core/robots/boards/BoardRobotPlanter.java +++ b/common/buildcraft/robots/boards/BoardRobotPlanter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.ArrayList; import java.util.Collection; @@ -30,15 +30,15 @@ import buildcraft.core.inventory.filters.ArrayStackOrListFilter; import buildcraft.core.inventory.filters.CompositeFilter; import buildcraft.core.inventory.filters.IStackFilter; import buildcraft.core.inventory.filters.OreStackFilter; -import buildcraft.core.robots.AIRobotFetchAndEquipItemStack; -import buildcraft.core.robots.AIRobotGotoBlock; -import buildcraft.core.robots.AIRobotGotoRandomGroundBlock; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotSearchBlock; -import buildcraft.core.robots.AIRobotUseToolOnBlock; -import buildcraft.core.robots.IBlockFilter; -import buildcraft.core.robots.ResourceIdBlock; -import buildcraft.silicon.statements.ActionRobotFilter; +import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; +import buildcraft.robots.ai.AIRobotGotoBlock; +import buildcraft.robots.ai.AIRobotGotoRandomGroundBlock; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotSearchBlock; +import buildcraft.robots.ai.AIRobotUseToolOnBlock; +import buildcraft.core.utils.IBlockFilter; +import buildcraft.robots.ResourceIdBlock; +import buildcraft.robots.statements.ActionRobotFilter; public class BoardRobotPlanter extends RedstoneBoardRobot { diff --git a/common/buildcraft/core/robots/boards/BoardRobotPlanterNBT.java b/common/buildcraft/robots/boards/BoardRobotPlanterNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotPlanterNBT.java rename to common/buildcraft/robots/boards/BoardRobotPlanterNBT.java index 9a02d285..f78499fa 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotPlanterNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotPlanterNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotPump.java b/common/buildcraft/robots/boards/BoardRobotPump.java similarity index 89% rename from common/buildcraft/core/robots/boards/BoardRobotPump.java rename to common/buildcraft/robots/boards/BoardRobotPump.java index f39fe345..eabbb2bf 100644 --- a/common/buildcraft/core/robots/boards/BoardRobotPump.java +++ b/common/buildcraft/robots/boards/BoardRobotPump.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.ArrayList; @@ -28,15 +28,15 @@ import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.robots.AIRobotGotoBlock; -import buildcraft.core.robots.AIRobotGotoSleep; -import buildcraft.core.robots.AIRobotGotoStationAndUnloadFluids; -import buildcraft.core.robots.AIRobotPumpBlock; -import buildcraft.core.robots.AIRobotSearchBlock; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.IBlockFilter; -import buildcraft.core.robots.ResourceIdBlock; -import buildcraft.silicon.statements.ActionRobotFilter; +import buildcraft.robots.ai.AIRobotGotoBlock; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotGotoStationAndUnloadFluids; +import buildcraft.robots.ai.AIRobotPumpBlock; +import buildcraft.robots.ai.AIRobotSearchBlock; +import buildcraft.robots.DockingStation; +import buildcraft.core.utils.IBlockFilter; +import buildcraft.robots.ResourceIdBlock; +import buildcraft.robots.statements.ActionRobotFilter; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/core/robots/boards/BoardRobotPumpNBT.java b/common/buildcraft/robots/boards/BoardRobotPumpNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotPumpNBT.java rename to common/buildcraft/robots/boards/BoardRobotPumpNBT.java index 1af434c6..748f4d90 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotPumpNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotPumpNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/robots/boards/BoardRobotShovelman.java b/common/buildcraft/robots/boards/BoardRobotShovelman.java similarity index 96% rename from common/buildcraft/core/robots/boards/BoardRobotShovelman.java rename to common/buildcraft/robots/boards/BoardRobotShovelman.java index 9ec67696..32ed54a1 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotShovelman.java +++ b/common/buildcraft/robots/boards/BoardRobotShovelman.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/core/robots/boards/BoardRobotShovelmanNBT.java b/common/buildcraft/robots/boards/BoardRobotShovelmanNBT.java similarity index 97% rename from common/buildcraft/core/robots/boards/BoardRobotShovelmanNBT.java rename to common/buildcraft/robots/boards/BoardRobotShovelmanNBT.java index b98cde4b..f30f3ece 100755 --- a/common/buildcraft/core/robots/boards/BoardRobotShovelmanNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotShovelmanNBT.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.robots.boards; +package buildcraft.robots.boards; import java.util.List; diff --git a/common/buildcraft/core/render/RenderRobot.java b/common/buildcraft/robots/render/RenderRobot.java similarity index 96% rename from common/buildcraft/core/render/RenderRobot.java rename to common/buildcraft/robots/render/RenderRobot.java index ce9780b9..2124a2aa 100644 --- a/common/buildcraft/core/render/RenderRobot.java +++ b/common/buildcraft/robots/render/RenderRobot.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.core.render; +package buildcraft.robots.render; import java.util.Date; @@ -29,8 +29,10 @@ import net.minecraftforge.client.IItemRenderer; import buildcraft.BuildCraftSilicon; import buildcraft.core.DefaultProps; import buildcraft.core.EntityLaser; -import buildcraft.core.ItemRobot; -import buildcraft.core.robots.EntityRobot; +import buildcraft.core.render.RenderLaser; +import buildcraft.core.render.RenderUtils; +import buildcraft.robots.ItemRobot; +import buildcraft.robots.EntityRobot; public class RenderRobot extends Render implements IItemRenderer { @@ -140,7 +142,7 @@ public class RenderRobot extends Render implements IItemRenderer { robot.laser.head.y = robot.posY; robot.laser.head.z = robot.posZ; - RenderLaser.doRenderLaser(renderManager.renderEngine, robot.laser, EntityLaser.LASER_TEXTURES [1]); + RenderLaser.doRenderLaser(renderManager.renderEngine, robot.laser, EntityLaser.LASER_TEXTURES[1]); } if (robot.getTexture() != null) { diff --git a/common/buildcraft/silicon/statements/ActionRobotFilter.java b/common/buildcraft/robots/statements/ActionRobotFilter.java similarity index 98% rename from common/buildcraft/silicon/statements/ActionRobotFilter.java rename to common/buildcraft/robots/statements/ActionRobotFilter.java index 2ac63a8e..b8c4c428 100755 --- a/common/buildcraft/silicon/statements/ActionRobotFilter.java +++ b/common/buildcraft/robots/statements/ActionRobotFilter.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import java.util.ArrayList; import java.util.Collection; @@ -29,7 +29,7 @@ import buildcraft.core.inventory.filters.IStackFilter; import buildcraft.core.inventory.filters.PassThroughFluidFilter; import buildcraft.core.inventory.filters.PassThroughStackFilter; import buildcraft.core.inventory.filters.StatementParameterStackFilter; -import buildcraft.core.robots.DockingStation; +import buildcraft.robots.DockingStation; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java b/common/buildcraft/robots/statements/ActionRobotGotoStation.java similarity index 92% rename from common/buildcraft/silicon/statements/ActionRobotGotoStation.java rename to common/buildcraft/robots/statements/ActionRobotGotoStation.java index 8f15285a..c370b30f 100644 --- a/common/buildcraft/silicon/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/robots/statements/ActionRobotGotoStation.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; @@ -20,10 +20,10 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.ItemMapLocation; -import buildcraft.core.robots.AIRobotGoAndLinkToDock; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.EntityRobot; -import buildcraft.core.robots.RobotRegistry; +import buildcraft.robots.ai.AIRobotGoAndLinkToDock; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; +import buildcraft.robots.RobotRegistry; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Gate; diff --git a/common/buildcraft/silicon/statements/ActionRobotWakeUp.java b/common/buildcraft/robots/statements/ActionRobotWakeUp.java similarity index 96% rename from common/buildcraft/silicon/statements/ActionRobotWakeUp.java rename to common/buildcraft/robots/statements/ActionRobotWakeUp.java index 4f226d10..98e43445 100755 --- a/common/buildcraft/silicon/statements/ActionRobotWakeUp.java +++ b/common/buildcraft/robots/statements/ActionRobotWakeUp.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java b/common/buildcraft/robots/statements/ActionRobotWorkInArea.java similarity index 97% rename from common/buildcraft/silicon/statements/ActionRobotWorkInArea.java rename to common/buildcraft/robots/statements/ActionRobotWorkInArea.java index b2cc70c2..82108042 100755 --- a/common/buildcraft/silicon/statements/ActionRobotWorkInArea.java +++ b/common/buildcraft/robots/statements/ActionRobotWorkInArea.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java b/common/buildcraft/robots/statements/ActionStationAcceptFluids.java similarity index 97% rename from common/buildcraft/silicon/statements/ActionStationAcceptFluids.java rename to common/buildcraft/robots/statements/ActionStationAcceptFluids.java index fd7f8c72..35fedffb 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptFluids.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptFluids.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java b/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java similarity index 94% rename from common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java rename to common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java index 2faee0af..7b44b077 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptItemsInv.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.inventory.IInventory; @@ -20,8 +20,8 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.EntityRobot; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; import buildcraft.core.utils.StringUtils; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java b/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java similarity index 94% rename from common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java rename to common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java index 0bdb63fa..7b983fd8 100755 --- a/common/buildcraft/silicon/statements/ActionStationAcceptItemsPipe.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java @@ -6,15 +6,15 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.EntityRobot; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; import buildcraft.core.utils.StringUtils; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TravelingItem; diff --git a/common/buildcraft/silicon/statements/ActionStationAllowCraft.java b/common/buildcraft/robots/statements/ActionStationAllowCraft.java similarity index 97% rename from common/buildcraft/silicon/statements/ActionStationAllowCraft.java rename to common/buildcraft/robots/statements/ActionStationAllowCraft.java index 15b79ef3..325ecb77 100755 --- a/common/buildcraft/silicon/statements/ActionStationAllowCraft.java +++ b/common/buildcraft/robots/statements/ActionStationAllowCraft.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/common/buildcraft/silicon/statements/ActionStationForbidRobot.java b/common/buildcraft/robots/statements/ActionStationForbidRobot.java similarity index 95% rename from common/buildcraft/silicon/statements/ActionStationForbidRobot.java rename to common/buildcraft/robots/statements/ActionStationForbidRobot.java index 0a080058..b8c989d4 100755 --- a/common/buildcraft/silicon/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/robots/statements/ActionStationForbidRobot.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; @@ -16,8 +16,8 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.core.ItemRobot; -import buildcraft.core.robots.DockingStation; +import buildcraft.robots.ItemRobot; +import buildcraft.robots.DockingStation; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; import buildcraft.transport.gates.ActionIterator; diff --git a/common/buildcraft/silicon/statements/ActionStationInputItems.java b/common/buildcraft/robots/statements/ActionStationInputItems.java similarity index 90% rename from common/buildcraft/silicon/statements/ActionStationInputItems.java rename to common/buildcraft/robots/statements/ActionStationInputItems.java index ab2b25ce..4db624f2 100755 --- a/common/buildcraft/silicon/statements/ActionStationInputItems.java +++ b/common/buildcraft/robots/statements/ActionStationInputItems.java @@ -6,15 +6,15 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import buildcraft.api.core.IInvSlot; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.inventory.filters.StatementParameterStackFilter; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.EntityRobot; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; import buildcraft.core.statements.BCStatement; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/silicon/statements/ActionStationProvideFluids.java b/common/buildcraft/robots/statements/ActionStationProvideFluids.java similarity index 97% rename from common/buildcraft/silicon/statements/ActionStationProvideFluids.java rename to common/buildcraft/robots/statements/ActionStationProvideFluids.java index e0ccef75..9e70a50a 100755 --- a/common/buildcraft/silicon/statements/ActionStationProvideFluids.java +++ b/common/buildcraft/robots/statements/ActionStationProvideFluids.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/common/buildcraft/silicon/statements/ActionStationProvideItems.java b/common/buildcraft/robots/statements/ActionStationProvideItems.java similarity index 97% rename from common/buildcraft/silicon/statements/ActionStationProvideItems.java rename to common/buildcraft/robots/statements/ActionStationProvideItems.java index 1244a57e..19ae58a7 100755 --- a/common/buildcraft/silicon/statements/ActionStationProvideItems.java +++ b/common/buildcraft/robots/statements/ActionStationProvideItems.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/common/buildcraft/silicon/statements/ActionStationRequestItems.java b/common/buildcraft/robots/statements/ActionStationRequestItems.java similarity index 94% rename from common/buildcraft/silicon/statements/ActionStationRequestItems.java rename to common/buildcraft/robots/statements/ActionStationRequestItems.java index a45b1985..2f84d5d5 100755 --- a/common/buildcraft/silicon/statements/ActionStationRequestItems.java +++ b/common/buildcraft/robots/statements/ActionStationRequestItems.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.inventory.IInventory; @@ -20,8 +20,8 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.EntityRobot; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; import buildcraft.core.utils.StringUtils; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java b/common/buildcraft/robots/statements/ActionStationRequestItemsMachine.java similarity index 96% rename from common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java rename to common/buildcraft/robots/statements/ActionStationRequestItemsMachine.java index 372e99bf..676d6908 100755 --- a/common/buildcraft/silicon/statements/ActionStationRequestItemsMachine.java +++ b/common/buildcraft/robots/statements/ActionStationRequestItemsMachine.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/common/buildcraft/silicon/statements/RobotsActionProvider.java b/common/buildcraft/robots/statements/RobotsActionProvider.java similarity index 97% rename from common/buildcraft/silicon/statements/RobotsActionProvider.java rename to common/buildcraft/robots/statements/RobotsActionProvider.java index ac0cce86..d0843600 100755 --- a/common/buildcraft/silicon/statements/RobotsActionProvider.java +++ b/common/buildcraft/robots/statements/RobotsActionProvider.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import java.util.ArrayList; import java.util.Collection; @@ -27,7 +27,7 @@ import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; -import buildcraft.core.robots.DockingStation; +import buildcraft.robots.DockingStation; import buildcraft.silicon.TileAssemblyTable; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TileGenericPipe; diff --git a/common/buildcraft/silicon/statements/RobotsTriggerProvider.java b/common/buildcraft/robots/statements/RobotsTriggerProvider.java similarity index 97% rename from common/buildcraft/silicon/statements/RobotsTriggerProvider.java rename to common/buildcraft/robots/statements/RobotsTriggerProvider.java index 77f709b9..1958bb75 100755 --- a/common/buildcraft/silicon/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/robots/statements/RobotsTriggerProvider.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import java.util.Collection; import java.util.LinkedList; diff --git a/common/buildcraft/silicon/statements/StateStationProvideItems.java b/common/buildcraft/robots/statements/StateStationProvideItems.java similarity index 95% rename from common/buildcraft/silicon/statements/StateStationProvideItems.java rename to common/buildcraft/robots/statements/StateStationProvideItems.java index 24b4db5f..680c2d28 100755 --- a/common/buildcraft/silicon/statements/StateStationProvideItems.java +++ b/common/buildcraft/robots/statements/StateStationProvideItems.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import java.util.LinkedList; diff --git a/common/buildcraft/silicon/statements/StateStationRequestItems.java b/common/buildcraft/robots/statements/StateStationRequestItems.java similarity index 95% rename from common/buildcraft/silicon/statements/StateStationRequestItems.java rename to common/buildcraft/robots/statements/StateStationRequestItems.java index 2eb437ee..ab872bc0 100755 --- a/common/buildcraft/silicon/statements/StateStationRequestItems.java +++ b/common/buildcraft/robots/statements/StateStationRequestItems.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import java.util.LinkedList; diff --git a/common/buildcraft/silicon/statements/TriggerRobotSleep.java b/common/buildcraft/robots/statements/TriggerRobotSleep.java similarity index 91% rename from common/buildcraft/silicon/statements/TriggerRobotSleep.java rename to common/buildcraft/robots/statements/TriggerRobotSleep.java index 02a07a80..fe9e86f3 100755 --- a/common/buildcraft/silicon/statements/TriggerRobotSleep.java +++ b/common/buildcraft/robots/statements/TriggerRobotSleep.java @@ -6,7 +6,7 @@ * License 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package buildcraft.silicon.statements; +package buildcraft.robots.statements; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,9 +16,9 @@ import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; -import buildcraft.core.robots.AIRobotSleep; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.EntityRobot; +import buildcraft.robots.ai.AIRobotSleep; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; import buildcraft.transport.Pipe; diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index b571bf15..8a4accaf 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -36,9 +36,9 @@ import buildcraft.core.network.CommandWriter; import buildcraft.core.network.ICommandReceiver; import buildcraft.core.network.PacketCommand; import buildcraft.core.recipes.AssemblyRecipeManager; -import buildcraft.core.robots.EntityRobot; -import buildcraft.core.robots.ResourceIdAssemblyTable; -import buildcraft.core.robots.RobotRegistry; +import buildcraft.robots.EntityRobot; +import buildcraft.robots.ResourceIdAssemblyTable; +import buildcraft.robots.RobotRegistry; import buildcraft.core.utils.StringUtils; import buildcraft.core.utils.Utils; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 7aeb47ae..4a6ba0fc 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -64,15 +64,15 @@ import buildcraft.core.BlockBuildCraft; import buildcraft.core.CoreConstants; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemMapLocation; -import buildcraft.core.ItemRobot; +import buildcraft.robots.ItemRobot; import buildcraft.core.TileBuffer; -import buildcraft.core.robots.DockingStation; -import buildcraft.core.robots.EntityRobot; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; import buildcraft.core.utils.MatrixTranformations; import buildcraft.core.utils.Utils; import buildcraft.transport.gates.GateDefinition; import buildcraft.transport.gates.GatePluggable; -import buildcraft.transport.pluggable.RobotStationPluggable; +import buildcraft.robots.RobotStationPluggable; import buildcraft.transport.render.PipeRendererWorld; public class BlockGenericPipe extends BlockBuildCraft { @@ -656,7 +656,8 @@ public class BlockGenericPipe extends BlockBuildCraft { if (rayTraceResult != null && rayTraceResult.hitPart == Part.Pluggable && pipe.container.getPipePluggable(rayTraceResult.sideHit) instanceof RobotStationPluggable) { - DockingStation station = pipe.container.getStation(rayTraceResult.sideHit); + RobotStationPluggable pluggable = (RobotStationPluggable) pipe.container.getPipePluggable(rayTraceResult.sideHit); + DockingStation station = pluggable.getStation(); if (!station.isTaken()) { if (ItemRobot.getRobotNBT(currentItem) == null) { diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index f129e889..edce856a 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -59,13 +59,11 @@ import buildcraft.core.network.BuildCraftPacket; import buildcraft.core.network.IGuiReturnHandler; import buildcraft.core.network.ISyncedTile; import buildcraft.core.network.PacketTileState; -import buildcraft.core.robots.DockingStation; import buildcraft.core.utils.Utils; import buildcraft.transport.ItemFacade.FacadeState; import buildcraft.transport.gates.GateFactory; import buildcraft.transport.gates.GatePluggable; import buildcraft.transport.pluggable.PlugPluggable; -import buildcraft.transport.pluggable.RobotStationPluggable; public class TileGenericPipe extends TileEntity implements IFluidHandler, IPipeTile, ITileBufferHolder, IEnergyHandler, IDropControlInventory, @@ -144,7 +142,7 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, } else if ("buildcraft.transport.gates.ItemPlug$PlugPluggable".equals(c)) { pluggableClass = PlugPluggable.class; } else if ("buildcraft.transport.gates.ItemRobotStation$RobotStationPluggable".equals(c)) { - pluggableClass = RobotStationPluggable.class; + pluggableClass = PipeManager.getPluggableByName("robotStation"); } } else { pluggableClass = PipeManager.getPluggableByName(pluggableData.getString("pluggableName")); @@ -200,9 +198,6 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, if (nbt.getBoolean("plug[" + i + "]")) { pluggable = new PlugPluggable(); } - if (nbt.getBoolean("robotStation[" + i + "]")) { - pluggable = new RobotStationPluggable(); - } if (pluggable != null) { pluggables[i] = pluggable; @@ -946,12 +941,6 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, return hasFacade(direction) && !((FacadePluggable) getPipePluggable(direction)).isTransparent(); } - public DockingStation getStation(ForgeDirection direction) { - PipePluggable pluggable = sideProperties.pluggables[direction.ordinal()]; - return pluggable instanceof RobotStationPluggable ? - ((RobotStationPluggable) pluggable).getStation() : null; - } - // Legacy public void setGate(Gate gate, int direction) { if (sideProperties.pluggables[direction] == null) {