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

make robots store energy in the ItemStack, make robots chargeable, begin refactoring rboots to separate module

Browse source
This commit is contained in:
asiekierka 2015-01-24 09:33:40 +01:00
parent 1015627d07
commit f0e06e1662
120 changed files with 404 additions and 328 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/buildcraft/BuildCraftCore.java
View file

@ -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;

70
common/buildcraft/BuildCraftSilicon.java
View file

@ -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 {

4
common/buildcraft/BuildCraftTransport.java
View file

@ -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;

4
common/buildcraft/builders/TileBuilder.java
View file

@ -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 {

4
common/buildcraft/commander/TileRequester.java
View file

@ -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 {

4
common/buildcraft/core/proxy/CoreProxyClient.java
View file

@ -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 {

2
common/buildcraft/core/robots/IBlockFilter.java → common/buildcraft/core/utils/IBlockFilter.java
View file

@ -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;

2
common/buildcraft/core/robots/IEntityFilter.java → common/buildcraft/core/utils/IEntityFilter.java
View file

@ -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;

1
common/buildcraft/core/utils/PathFinding.java
View file

@ -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

2
common/buildcraft/core/robots/DockingStation.java → common/buildcraft/robots/DockingStation.java
View file

@ -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;

8
common/buildcraft/core/robots/EntityRobot.java → common/buildcraft/robots/EntityRobot.java
View file

@ -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);

16
common/buildcraft/core/robots/EntityRobotEnergyFX.java → common/buildcraft/robots/EntityRobotEnergyParticle.java
View file

@ -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;

2
common/buildcraft/core/robots/IStationFilter.java → common/buildcraft/robots/IStationFilter.java
View file

@ -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 {

51
common/buildcraft/core/ItemRobot.java → common/buildcraft/robots/ItemRobot.java
View file

@ -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;
}
}

2
common/buildcraft/transport/pluggable/ItemRobotStation.java → common/buildcraft/robots/ItemRobotStation.java
View file

@ -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;

2
common/buildcraft/core/robots/ResourceIdAssemblyTable.java → common/buildcraft/robots/ResourceIdAssemblyTable.java
View file

@ -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;

2
common/buildcraft/core/robots/ResourceIdBlock.java → common/buildcraft/robots/ResourceIdBlock.java
View file

@ -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;

2
common/buildcraft/core/robots/ResourceIdRequest.java → common/buildcraft/robots/ResourceIdRequest.java
View file

@ -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;

6
common/buildcraft/core/robots/RobotIntegrationRecipe.java → common/buildcraft/robots/RobotIntegrationRecipe.java
View file

@ -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<ItemStack> result = super.craft(crafter, preview, inputA, inputB);
if (result != null) {
result.crafted = ItemRobot.createRobotStack(inputB);
result.crafted = ItemRobot.createRobotStack(inputB, 0);
return result;
} else {

2
common/buildcraft/core/robots/RobotRegistry.java → common/buildcraft/robots/RobotRegistry.java
View file

@ -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;

4
common/buildcraft/transport/pluggable/RobotStationPluggable.java → common/buildcraft/robots/RobotStationPluggable.java
View file

@ -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;

2
common/buildcraft/core/robots/StationIndex.java → common/buildcraft/robots/StationIndex.java
View file

@ -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;

3
common/buildcraft/core/robots/AIRobotAttack.java → common/buildcraft/robots/ai/AIRobotAttack.java
View file

@ -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 {

2
common/buildcraft/core/robots/AIRobotBreak.java → common/buildcraft/robots/ai/AIRobotBreak.java
View file

@ -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;

11
common/buildcraft/core/robots/AIRobotCraftAssemblyTable.java → common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java
View file

@ -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 {

9
common/buildcraft/core/robots/AIRobotCraftFurnace.java → common/buildcraft/robots/ai/AIRobotCraftFurnace.java
View file

@ -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 {

2
common/buildcraft/core/robots/AIRobotCraftGeneric.java → common/buildcraft/robots/ai/AIRobotCraftGeneric.java
View file

@ -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;

8
common/buildcraft/core/robots/AIRobotCraftWorkbench.java → common/buildcraft/robots/ai/AIRobotCraftWorkbench.java
View file

@ -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 {

6
common/buildcraft/core/robots/AIRobotDeliverRequested.java → common/buildcraft/robots/ai/AIRobotDeliverRequested.java
View file

@ -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;

2
common/buildcraft/core/robots/AIRobotDisposeItems.java → common/buildcraft/robots/ai/AIRobotDisposeItems.java
View file

@ -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;

3
common/buildcraft/core/robots/AIRobotFetchAndEquipItemStack.java → common/buildcraft/robots/ai/AIRobotFetchAndEquipItemStack.java
View file

@ -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 {

4
common/buildcraft/core/robots/AIRobotFetchItem.java → common/buildcraft/robots/ai/AIRobotFetchItem.java
View file

@ -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 {

3
common/buildcraft/core/robots/AIRobotGoAndLinkToDock.java → common/buildcraft/robots/ai/AIRobotGoAndLinkToDock.java
View file

@ -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 {

2
common/buildcraft/core/robots/AIRobotGoto.java → common/buildcraft/robots/ai/AIRobotGoto.java
View file

@ -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;

2
common/buildcraft/core/robots/AIRobotGotoBlock.java → common/buildcraft/robots/ai/AIRobotGotoBlock.java
View file

@ -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;

3
common/buildcraft/core/robots/AIRobotGotoRandomGroundBlock.java → common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java
View file

@ -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;

2
common/buildcraft/core/robots/AIRobotGotoSleep.java → common/buildcraft/robots/ai/AIRobotGotoSleep.java
View file

@ -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;

3
common/buildcraft/core/robots/AIRobotGotoStation.java → common/buildcraft/robots/ai/AIRobotGotoStation.java
View file

@ -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 {

2
common/buildcraft/core/robots/AIRobotGotoStationAndLoad.java → common/buildcraft/robots/ai/AIRobotGotoStationAndLoad.java
View file

@ -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;

2
common/buildcraft/core/robots/AIRobotGotoStationAndLoadFluids.java → common/buildcraft/robots/ai/AIRobotGotoStationAndLoadFluids.java
View file

@ -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;

3
common/buildcraft/core/robots/AIRobotGotoStationAndUnload.java → common/buildcraft/robots/ai/AIRobotGotoStationAndUnload.java
View file

@ -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 {

2
common/buildcraft/core/robots/AIRobotGotoStationAndUnloadFluids.java → common/buildcraft/robots/ai/AIRobotGotoStationAndUnloadFluids.java
View file

@ -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;

8
common/buildcraft/core/robots/AIRobotGotoStationToLoad.java → common/buildcraft/robots/ai/AIRobotGotoStationToLoad.java
View file

@ -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 {

8
common/buildcraft/core/robots/AIRobotGotoStationToLoadFluids.java → common/buildcraft/robots/ai/AIRobotGotoStationToLoadFluids.java
View file

@ -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 {

7
common/buildcraft/core/robots/AIRobotGotoStationToUnload.java → common/buildcraft/robots/ai/AIRobotGotoStationToUnload.java
View file

@ -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;

8
common/buildcraft/core/robots/AIRobotGotoStationToUnloadFluids.java → common/buildcraft/robots/ai/AIRobotGotoStationToUnloadFluids.java
View file

@ -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 {

7
common/buildcraft/core/robots/AIRobotLoad.java → common/buildcraft/robots/ai/AIRobotLoad.java
View file

@ -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 {

7
common/buildcraft/core/robots/AIRobotLoadFluids.java → common/buildcraft/robots/ai/AIRobotLoadFluids.java
View file

@ -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 {

2
common/buildcraft/core/robots/AIRobotMain.java → common/buildcraft/robots/ai/AIRobotMain.java
View file

@ -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;

2
common/buildcraft/core/robots/AIRobotPumpBlock.java → common/buildcraft/robots/ai/AIRobotPumpBlock.java
View file

@ -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;

4
common/buildcraft/core/robots/AIRobotRecharge.java → common/buildcraft/robots/ai/AIRobotRecharge.java
View file

@ -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 {

4
common/buildcraft/core/robots/AIRobotSearchAndGotoStation.java → common/buildcraft/robots/ai/AIRobotSearchAndGotoStation.java
View file

@ -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 {

3
common/buildcraft/core/robots/AIRobotSearchBlock.java → common/buildcraft/robots/ai/AIRobotSearchBlock.java
View file

@ -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;

3
common/buildcraft/core/robots/AIRobotSearchEntity.java → common/buildcraft/robots/ai/AIRobotSearchEntity.java
View file

@ -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 {

3
common/buildcraft/core/robots/AIRobotSearchRandomGroundBlock.java → common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java
View file

@ -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 {

10
common/buildcraft/core/robots/AIRobotSearchStackRequest.java → common/buildcraft/robots/ai/AIRobotSearchStackRequest.java
View file

@ -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;

6
common/buildcraft/core/robots/AIRobotSearchStation.java → common/buildcraft/robots/ai/AIRobotSearchStation.java
View file

@ -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 {

5
common/buildcraft/core/robots/AIRobotSleep.java → common/buildcraft/robots/ai/AIRobotSleep.java
View file

@ -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;

2
common/buildcraft/core/robots/AIRobotStraightMoveTo.java → common/buildcraft/robots/ai/AIRobotStraightMoveTo.java
View file

@ -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;

6
common/buildcraft/core/robots/AIRobotUnload.java → common/buildcraft/robots/ai/AIRobotUnload.java
View file

@ -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;

7
common/buildcraft/core/robots/AIRobotUnloadFluids.java → common/buildcraft/robots/ai/AIRobotUnloadFluids.java
View file

@ -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 {

2
common/buildcraft/core/robots/AIRobotUseToolOnBlock.java → common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java
View file

@ -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;

12
common/buildcraft/core/robots/boards/BoardRobotBomber.java → common/buildcraft/robots/boards/BoardRobotBomber.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotBomberNBT.java → common/buildcraft/robots/boards/BoardRobotBomberNBT.java
View file

@ -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;

12
common/buildcraft/core/robots/boards/BoardRobotBuilder.java → common/buildcraft/robots/boards/BoardRobotBuilder.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotBuilderNBT.java → common/buildcraft/robots/boards/BoardRobotBuilderNBT.java
View file

@ -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;

12
common/buildcraft/core/robots/boards/BoardRobotButcher.java → common/buildcraft/robots/boards/BoardRobotButcher.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotButcherNBT.java → common/buildcraft/robots/boards/BoardRobotButcherNBT.java
View file

@ -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;

12
common/buildcraft/core/robots/boards/BoardRobotCarrier.java → common/buildcraft/robots/boards/BoardRobotCarrier.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotCarrierNBT.java → common/buildcraft/robots/boards/BoardRobotCarrierNBT.java
View file

@ -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;

24
common/buildcraft/core/robots/boards/BoardRobotCrafter.java → common/buildcraft/robots/boards/BoardRobotCrafter.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotCrafterNBT.java → common/buildcraft/robots/boards/BoardRobotCrafterNBT.java
View file

@ -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;

14
common/buildcraft/core/robots/boards/BoardRobotDelivery.java → common/buildcraft/robots/boards/BoardRobotDelivery.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotDeliveryNBT.java → common/buildcraft/robots/boards/BoardRobotDeliveryNBT.java
View file

@ -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;

18
common/buildcraft/core/robots/boards/BoardRobotFarmer.java → common/buildcraft/robots/boards/BoardRobotFarmer.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotFarmerNBT.java → common/buildcraft/robots/boards/BoardRobotFarmerNBT.java
View file

@ -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;

10
common/buildcraft/core/robots/boards/BoardRobotFluidCarrier.java → common/buildcraft/robots/boards/BoardRobotFluidCarrier.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotFluidCarrierNBT.java → common/buildcraft/robots/boards/BoardRobotFluidCarrierNBT.java
View file

@ -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
common/buildcraft/core/robots/boards/BoardRobotGenericBreakBlock.java → common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java
View file

@ -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;

2
common/buildcraft/core/robots/boards/BoardRobotHarvester.java → common/buildcraft/robots/boards/BoardRobotHarvester.java
View file

@ -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;

2
common/buildcraft/core/robots/boards/BoardRobotHarvesterNBT.java → common/buildcraft/robots/boards/BoardRobotHarvesterNBT.java
View file

@ -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;

12
common/buildcraft/core/robots/boards/BoardRobotKnight.java → common/buildcraft/robots/boards/BoardRobotKnight.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotKnightNBT.java → common/buildcraft/robots/boards/BoardRobotKnightNBT.java
View file

@ -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;

2
common/buildcraft/core/robots/boards/BoardRobotLeaveCutter.java → common/buildcraft/robots/boards/BoardRobotLeaveCutter.java
View file

@ -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;

2
common/buildcraft/core/robots/boards/BoardRobotLeaveCutterNBT.java → common/buildcraft/robots/boards/BoardRobotLeaveCutterNBT.java
View file

@ -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;

2
common/buildcraft/core/robots/boards/BoardRobotLumberjack.java → common/buildcraft/robots/boards/BoardRobotLumberjack.java
View file

@ -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;

2
common/buildcraft/core/robots/boards/BoardRobotLumberjackNBT.java → common/buildcraft/robots/boards/BoardRobotLumberjackNBT.java
View file

@ -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;

4
common/buildcraft/core/robots/boards/BoardRobotMiner.java → common/buildcraft/robots/boards/BoardRobotMiner.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotMinerNBT.java → common/buildcraft/robots/boards/BoardRobotMinerNBT.java
View file

@ -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;

10
common/buildcraft/core/robots/boards/BoardRobotPicker.java → common/buildcraft/robots/boards/BoardRobotPicker.java
View file

@ -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 {

4
common/buildcraft/core/robots/boards/BoardRobotPickerNBT.java → common/buildcraft/robots/boards/BoardRobotPickerNBT.java
View file

@ -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 {

20
common/buildcraft/core/robots/boards/BoardRobotPlanter.java → common/buildcraft/robots/boards/BoardRobotPlanter.java
View file

@ -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 {

2
common/buildcraft/core/robots/boards/BoardRobotPlanterNBT.java → common/buildcraft/robots/boards/BoardRobotPlanterNBT.java
View file

@ -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
common/buildcraft/core/robots/boards/BoardRobotPump.java → common/buildcraft/robots/boards/BoardRobotPump.java
View file

@ -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;

2
common/buildcraft/core/robots/boards/BoardRobotPumpNBT.java → common/buildcraft/robots/boards/BoardRobotPumpNBT.java
View file

@ -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;

2
common/buildcraft/core/robots/boards/BoardRobotShovelman.java → common/buildcraft/robots/boards/BoardRobotShovelman.java
View file

@ -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;

2
common/buildcraft/core/robots/boards/BoardRobotShovelmanNBT.java → common/buildcraft/robots/boards/BoardRobotShovelmanNBT.java
View file

@ -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;

10
common/buildcraft/core/render/RenderRobot.java → common/buildcraft/robots/render/RenderRobot.java
View file

@ -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) {

4
common/buildcraft/silicon/statements/ActionRobotFilter.java → common/buildcraft/robots/statements/ActionRobotFilter.java
View file

@ -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;

10
common/buildcraft/silicon/statements/ActionRobotGotoStation.java → common/buildcraft/robots/statements/ActionRobotGotoStation.java
View file

@ -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;

Some files were not shown because too many files have changed in this diff Show more