From a14eb3b55fea33f1f595ff987a0c6c8054a60f37 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 22 Jan 2015 13:49:08 +0100 Subject: [PATCH 01/67] add IFacadePluggable, let mods define their own IFacadePluggables and query facades; NPE fixes on rare world corruptions --- api/buildcraft/api/transport/IPipeTile.java | 6 +-- .../api/transport/package-info.java | 2 +- .../transport/pluggable/IFacadePluggable.java | 10 +++++ .../buildcraft/transport/FacadePluggable.java | 43 +++++++++++++------ common/buildcraft/transport/ItemFacade.java | 9 +++- .../transport/PipeTransportItems.java | 4 ++ .../buildcraft/transport/TileGenericPipe.java | 9 ++-- .../transport/render/FacadeBlockAccess.java | 17 ++++---- .../transport/render/FacadeRenderHelper.java | 30 +++++++++---- 9 files changed, 92 insertions(+), 38 deletions(-) create mode 100644 api/buildcraft/api/transport/pluggable/IFacadePluggable.java diff --git a/api/buildcraft/api/transport/IPipeTile.java b/api/buildcraft/api/transport/IPipeTile.java index a6e2d3a6..c8b3b4e7 100644 --- a/api/buildcraft/api/transport/IPipeTile.java +++ b/api/buildcraft/api/transport/IPipeTile.java @@ -48,8 +48,8 @@ public interface IPipeTile extends IInjectable { IPipe getPipe(); int getPipeColor(); - PipePluggable getPipePluggable(ForgeDirection direction); - boolean hasPipePluggable(ForgeDirection direction); + PipePluggable getPipePluggable(ForgeDirection direction); // Now in IPluggableProvider + boolean hasPipePluggable(ForgeDirection direction); // Now in IPluggableProvider boolean hasBlockingPluggable(ForgeDirection direction); void scheduleNeighborChange(); @@ -57,6 +57,6 @@ public interface IPipeTile extends IInjectable { // For compatibility with BC 6.2.x and below int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, EnumColor color); - @Deprecated + @Deprecated // Now in IInjectable int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from); } diff --git a/api/buildcraft/api/transport/package-info.java b/api/buildcraft/api/transport/package-info.java index 77d44059..f4c84cb4 100644 --- a/api/buildcraft/api/transport/package-info.java +++ b/api/buildcraft/api/transport/package-info.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "3.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") +@API(apiVersion = "3.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") package buildcraft.api.transport; import cpw.mods.fml.common.API; diff --git a/api/buildcraft/api/transport/pluggable/IFacadePluggable.java b/api/buildcraft/api/transport/pluggable/IFacadePluggable.java new file mode 100644 index 00000000..08ae33f7 --- /dev/null +++ b/api/buildcraft/api/transport/pluggable/IFacadePluggable.java @@ -0,0 +1,10 @@ +package buildcraft.api.transport.pluggable; + +import net.minecraft.block.Block; + +public interface IFacadePluggable { + public Block getCurrentBlock(); + public int getCurrentMetadata(); + public boolean isTransparent(); + public boolean isHollow(); +} diff --git a/common/buildcraft/transport/FacadePluggable.java b/common/buildcraft/transport/FacadePluggable.java index 8b60fef4..091c25e1 100644 --- a/common/buildcraft/transport/FacadePluggable.java +++ b/common/buildcraft/transport/FacadePluggable.java @@ -11,11 +11,12 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.IPipeTile; +import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.IPipePluggableRenderer; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.utils.MatrixTranformations; -public class FacadePluggable extends PipePluggable { +public class FacadePluggable extends PipePluggable implements IFacadePluggable { public ItemFacade.FacadeState[] states; private ItemFacade.FacadeState activeState; @@ -26,7 +27,7 @@ public class FacadePluggable extends PipePluggable { public FacadePluggable(ItemFacade.FacadeState[] states) { this.states = states; - activeState = states.length > 0 ? states[0] : null; + prepareStates(); } public FacadePluggable() { @@ -51,7 +52,7 @@ public class FacadePluggable extends PipePluggable { if (states != null) { return new ItemStack[] { ItemFacade.getFacade(states) }; } else { - return new ItemStack[] { ItemFacade.getFacade(new ItemFacade.FacadeState(getRenderingBlock(), getRenderingMeta(), null, isHollow())) }; + return new ItemStack[] { ItemFacade.getFacade(new ItemFacade.FacadeState(getCurrentBlock(), getCurrentMetadata(), null, isHollow())) }; } } @@ -60,13 +61,28 @@ public class FacadePluggable extends PipePluggable { return !isHollow(); } - public boolean isHollow() { - return states == null ? renderAsHollow : states[0].hollow; + @Override + public Block getCurrentBlock() { + prepareStates(); + return activeState == null ? block : activeState.block; } - public Block getRenderingBlock() { return block; } - public int getRenderingMeta() { return meta; } - public boolean getRenderingTransparent() { return transparent; } + @Override + public int getCurrentMetadata() { + prepareStates(); + return activeState == null ? meta : activeState.metadata; + } + + @Override + public boolean isTransparent() { + prepareStates(); + return activeState == null ? transparent : activeState.transparent; + } + + public boolean isHollow() { + prepareStates(); + return activeState == null ? renderAsHollow : activeState.hollow; + } @Override public AxisAlignedBB getBoundingBox(ForgeDirection side) { @@ -97,9 +113,7 @@ public class FacadePluggable extends PipePluggable { @Override public void writeData(ByteBuf data) { - if (activeState == null) { - activeState = states.length > 0 ? states[0] : null; - } + prepareStates(); if (activeState == null || activeState.block == null) { data.writeShort(0); @@ -114,7 +128,6 @@ public class FacadePluggable extends PipePluggable { @Override public void readData(ByteBuf data) { - int blockId = data.readUnsignedShort(); if (blockId > 0) { block = Block.getBlockById(blockId); @@ -129,6 +142,12 @@ public class FacadePluggable extends PipePluggable { renderAsHollow = (flags & 0x40) > 0; } + private void prepareStates() { + if (activeState == null) { + activeState = states != null && states.length > 0 ? states[0] : null; + } + } + protected void setActiveState(int id) { if (id >= 0 && id < states.length) { activeState = states[id]; diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 12081c44..d64e8821 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -27,6 +27,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -244,8 +245,12 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug private void registerValidFacades(Block block, Item item) { //for (int i = 0; i < 16; i++) { ArrayList stacks = new ArrayList(16); - for (CreativeTabs tab : item.getCreativeTabs()) { - block.getSubBlocks(item, tab, stacks); + if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { + block.getSubBlocks(item, null, stacks); + } else { + for (int i = 0; i < 16; i++) { + stacks.add(new ItemStack(item, 1, i)); + } } for (ItemStack stack : stacks) { try { diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index 34e8a590..9a7afa59 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -231,6 +231,10 @@ public class PipeTransportItems extends PipeTransport { if (entity instanceof IPipeTile) { Pipe pipe = (Pipe) ((IPipeTile) entity).getPipe(); + if (pipe == null || pipe.transport == null) { + return false; + } + //return !pipe.pipe.isClosed() && pipe.pipe.transport instanceof PipeTransportItems; return pipe.inputOpen(o.getOpposite()) && pipe.transport instanceof PipeTransportItems; } else if (entity instanceof IInventory && item.getInsertionHandler().canInsertItem(item, (IInventory) entity)) { diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index d63a8756..f129e889 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -49,6 +49,7 @@ import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.PipeManager; import buildcraft.api.transport.PipeWire; +import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.DefaultProps; import buildcraft.core.IDropControlInventory; @@ -348,7 +349,9 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, worldObj.notifyBlockOfNeighborChange(xCoord, yCoord, zCoord, getBlock()); scheduleRenderUpdate(); sendUpdateToClient(); - BlockGenericPipe.updateNeighbourSignalState(pipe); + if (pipe != null) { + BlockGenericPipe.updateNeighbourSignalState(pipe); + } } @Override @@ -896,7 +899,7 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, if (direction == null || direction == ForgeDirection.UNKNOWN) { return false; } else { - return sideProperties.pluggables[direction.ordinal()] instanceof FacadePluggable; + return sideProperties.pluggables[direction.ordinal()] instanceof IFacadePluggable; } } @@ -940,7 +943,7 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, } public boolean hasEnabledFacade(ForgeDirection direction) { - return hasFacade(direction) && !((FacadePluggable) getPipePluggable(direction)).getRenderingTransparent(); + return hasFacade(direction) && !((FacadePluggable) getPipePluggable(direction)).isTransparent(); } public DockingStation getStation(ForgeDirection direction) { diff --git a/common/buildcraft/transport/render/FacadeBlockAccess.java b/common/buildcraft/transport/render/FacadeBlockAccess.java index 1e79a7e3..af27afe7 100644 --- a/common/buildcraft/transport/render/FacadeBlockAccess.java +++ b/common/buildcraft/transport/render/FacadeBlockAccess.java @@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.FacadePluggable; @@ -22,13 +23,13 @@ public class FacadeBlockAccess implements IBlockAccess { @Override public Block getBlock(int x, int y, int z) { - System.out.println("Querying block at " + x + ", " + y + ", " + z); + //System.out.println("Querying block at " + x + ", " + y + ", " + z); TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof TileGenericPipe) { PipePluggable p = ((TileGenericPipe) tile).getPipePluggable(side); - if (p instanceof FacadePluggable) { - System.out.println("Found facade"); - return ((FacadePluggable) p).getRenderingBlock(); + if (p instanceof IFacadePluggable) { + //System.out.println("Found facade"); + return ((IFacadePluggable) p).getCurrentBlock(); } } return Blocks.air; @@ -46,13 +47,13 @@ public class FacadeBlockAccess implements IBlockAccess { @Override public int getBlockMetadata(int x, int y, int z) { - System.out.println("Querying block metadata at " + x + ", " + y + ", " + z); + //System.out.println("Querying block metadata at " + x + ", " + y + ", " + z); TileEntity tile = world.getTileEntity(x, y, z); if (tile instanceof TileGenericPipe) { PipePluggable p = ((TileGenericPipe) tile).getPipePluggable(side); - if (p instanceof FacadePluggable) { - System.out.println("Found facade " + ((FacadePluggable) p).getRenderingMeta()); - return ((FacadePluggable) p).getRenderingMeta(); + if (p instanceof IFacadePluggable) { + //System.out.println("Found facade " + ((FacadePluggable) p).getRenderingMeta()); + return ((IFacadePluggable) p).getCurrentMetadata(); } } return 0; diff --git a/common/buildcraft/transport/render/FacadeRenderHelper.java b/common/buildcraft/transport/render/FacadeRenderHelper.java index d6fe778f..253a5291 100644 --- a/common/buildcraft/transport/render/FacadeRenderHelper.java +++ b/common/buildcraft/transport/render/FacadeRenderHelper.java @@ -17,6 +17,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.render.ITextureStates; +import buildcraft.api.transport.pluggable.IFacadePluggable; +import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CoreConstants; import buildcraft.core.utils.MatrixTranformations; import buildcraft.transport.BlockGenericPipe; @@ -102,19 +104,24 @@ public final class FacadeRenderHelper { //block_statemachine.setRenderAllSides(); for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { - if (!(tile.getPipePluggable(direction) instanceof FacadePluggable)) { + if (!(tile.getPipePluggable(direction) instanceof IFacadePluggable)) { continue; } - FacadePluggable pluggable = (FacadePluggable) tile.getPipePluggable(direction); - Block renderBlock = pluggable.getRenderingBlock(); + IFacadePluggable pluggable = (IFacadePluggable) tile.getPipePluggable(direction); + if (((PipePluggable) pluggable).getRenderer() != null) { + // This IFacadePluggable provides its own renderer. + continue; + } + + Block renderBlock = pluggable.getCurrentBlock(); if (renderBlock != null) { IBlockAccess facadeBlockAccess = new FacadeBlockAccess(tile.getWorldObj(), direction); // If the facade is meant to render in the current pass if (renderBlock.canRenderInPass(PipeRendererWorld.renderPass)) { - int renderMeta = pluggable.getRenderingMeta(); + int renderMeta = pluggable.getCurrentMetadata(); for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { textures[side.ordinal()] = renderBlock.getIcon( @@ -126,11 +133,11 @@ public final class FacadeRenderHelper { if (side == direction || side == direction.getOpposite()) { blockStateMachine.setRenderSide(side, true); } else { - if (!(tile.getPipePluggable(side) instanceof FacadePluggable)) { + if (!(tile.getPipePluggable(side) instanceof IFacadePluggable)) { blockStateMachine.setRenderSide(side, true); } else { - FacadePluggable pluggable2 = (FacadePluggable) tile.getPipePluggable(side); - blockStateMachine.setRenderSide(side, pluggable2.getRenderingBlock() == null); + IFacadePluggable pluggable2 = (IFacadePluggable) tile.getPipePluggable(side); + blockStateMachine.setRenderSide(side, pluggable2.getCurrentBlock() == null); } } } @@ -212,8 +219,13 @@ public final class FacadeRenderHelper { // Always render connectors in pass 0 if (PipeRendererWorld.renderPass == 0) { for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { - if (tile.getPipePluggable(direction) instanceof FacadePluggable) { - FacadePluggable pluggable = (FacadePluggable) tile.getPipePluggable(direction); + if (tile.getPipePluggable(direction) instanceof IFacadePluggable) { + IFacadePluggable pluggable = (IFacadePluggable) tile.getPipePluggable(direction); + + if (((PipePluggable) pluggable).getRenderer() != null) { + // This IFacadePluggable provides its own renderer. + continue; + } if (!pluggable.isHollow()) { float[][] rotated = MatrixTranformations.deepClone(zeroStateSupport); From 1015627d0788816c0f4bf5d38faba68f8517df44 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 22 Jan 2015 15:33:39 +0100 Subject: [PATCH 02/67] make robots actually use energy, fix a massive bug - only in 6.4.x, though, as i do not want to break most robot builds in a patch release --- common/buildcraft/core/robots/AIRobotRecharge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/core/robots/AIRobotRecharge.java b/common/buildcraft/core/robots/AIRobotRecharge.java index d308e0bf..1a1940be 100755 --- a/common/buildcraft/core/robots/AIRobotRecharge.java +++ b/common/buildcraft/core/robots/AIRobotRecharge.java @@ -37,7 +37,7 @@ public class AIRobotRecharge extends AIRobot { public void update() { PipeTransportPower powerProvider = (PipeTransportPower) ((DockingStation) robot.getDockingStation()).getPipe().pipe.transport; - int amount = robot.getBattery().receiveEnergy(1000, false); + int amount = robot.getBattery().receiveEnergy(1000, true); powerProvider.requestEnergy(robot.getDockingStation().side(), amount); From f0e06e1662c7b776e29eda79a38bea74a9af94dd Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 24 Jan 2015 09:33:40 +0100 Subject: [PATCH 03/67] 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) { From 281d7409f98db341a0c1f8d7e3515ee8a8008fe8 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 24 Jan 2015 09:46:02 +0100 Subject: [PATCH 04/67] further cleanup - make robots respect IPipeTile --- common/buildcraft/robots/RobotUtils.java | 22 +++++++++++++++++++ .../statements/ActionRobotGotoStation.java | 12 +++++++--- .../statements/RobotsActionProvider.java | 14 +++++++----- .../statements/RobotsTriggerProvider.java | 18 +++++++++------ .../robots/statements/TriggerRobotSleep.java | 9 ++++---- 5 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 common/buildcraft/robots/RobotUtils.java diff --git a/common/buildcraft/robots/RobotUtils.java b/common/buildcraft/robots/RobotUtils.java new file mode 100644 index 00000000..1acdd83c --- /dev/null +++ b/common/buildcraft/robots/RobotUtils.java @@ -0,0 +1,22 @@ +package buildcraft.robots; + +import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.IPipeTile; +import buildcraft.transport.TileGenericPipe; + +/** + * Created by asie on 1/24/15. + */ +public class RobotUtils { + private RobotUtils() { + + } + + public static DockingStation getStation(IPipeTile tile, ForgeDirection d) { + if (tile.getPipePluggable(d) instanceof RobotStationPluggable) { + RobotStationPluggable pluggable = (RobotStationPluggable) tile.getPipePluggable(d); + return pluggable.getStation(); + } + return null; + } +} diff --git a/common/buildcraft/robots/statements/ActionRobotGotoStation.java b/common/buildcraft/robots/statements/ActionRobotGotoStation.java index c370b30f..82c63bf0 100644 --- a/common/buildcraft/robots/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/robots/statements/ActionRobotGotoStation.java @@ -19,7 +19,9 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.api.transport.IPipeTile; import buildcraft.core.ItemMapLocation; +import buildcraft.robots.RobotUtils; import buildcraft.robots.ai.AIRobotGoAndLinkToDock; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; @@ -47,11 +49,15 @@ public class ActionRobotGotoStation extends BCStatement implements IActionIntern @Override public void actionActivate(IStatementContainer container, IStatementParameter[] parameters) { - Pipe pipe = ((Gate) container).pipe; - RobotRegistry registry = RobotRegistry.getRegistry(pipe.getWorld()); + if (!(container.getTile() instanceof IPipeTile)) { + return; + } + + IPipeTile tile = (IPipeTile) container.getTile(); + RobotRegistry registry = RobotRegistry.getRegistry(tile.getWorldObj()); for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { - DockingStation station = pipe.container.getStation(d); + DockingStation station = RobotUtils.getStation(tile, d); if (station != null && station.robotTaking() != null) { EntityRobot robot = (EntityRobot) station.robotTaking(); diff --git a/common/buildcraft/robots/statements/RobotsActionProvider.java b/common/buildcraft/robots/statements/RobotsActionProvider.java index d0843600..f62567b2 100755 --- a/common/buildcraft/robots/statements/RobotsActionProvider.java +++ b/common/buildcraft/robots/statements/RobotsActionProvider.java @@ -27,7 +27,10 @@ import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.transport.IPipe; +import buildcraft.api.transport.IPipeTile; import buildcraft.robots.DockingStation; +import buildcraft.robots.RobotUtils; import buildcraft.silicon.TileAssemblyTable; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TileGenericPipe; @@ -36,19 +39,18 @@ public class RobotsActionProvider implements IActionProvider { @Override public Collection getInternalActions(IStatementContainer container) { + LinkedList result = new LinkedList(); TileEntity tile = container.getTile(); - if (!(tile instanceof TileGenericPipe)) { - return null; + if (!(tile instanceof IPipeTile)) { + return result; } - - LinkedList result = new LinkedList(); ArrayList stations = new ArrayList(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (((TileGenericPipe) tile).getStation(dir) != null) { - stations.add(((TileGenericPipe) tile).getStation(dir)); + if (RobotUtils.getStation((IPipeTile) tile, dir) != null) { + stations.add(RobotUtils.getStation((IPipeTile) tile, dir)); } } diff --git a/common/buildcraft/robots/statements/RobotsTriggerProvider.java b/common/buildcraft/robots/statements/RobotsTriggerProvider.java index 1958bb75..6e11a72b 100755 --- a/common/buildcraft/robots/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/robots/statements/RobotsTriggerProvider.java @@ -8,6 +8,7 @@ */ package buildcraft.robots.statements; +import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; @@ -16,10 +17,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftSilicon; +import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; +import buildcraft.api.transport.IPipeTile; +import buildcraft.robots.DockingStation; +import buildcraft.robots.RobotUtils; import buildcraft.transport.TileGenericPipe; public class RobotsTriggerProvider implements ITriggerProvider { @@ -28,21 +33,20 @@ public class RobotsTriggerProvider implements ITriggerProvider { public Collection getInternalTriggers(IStatementContainer container) { LinkedList result = new LinkedList(); TileEntity tile = container.getTile(); - - if (!(tile instanceof TileGenericPipe)) { + + if (!(tile instanceof IPipeTile)) { return result; } - boolean stationFound = false; + ArrayList stations = new ArrayList(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (((TileGenericPipe) tile).getStation(dir) != null) { - stationFound = true; - break; + if (RobotUtils.getStation((IPipeTile) tile, dir) != null) { + stations.add(RobotUtils.getStation((IPipeTile) tile, dir)); } } - if (!stationFound) { + if (stations.size() == 0) { return result; } diff --git a/common/buildcraft/robots/statements/TriggerRobotSleep.java b/common/buildcraft/robots/statements/TriggerRobotSleep.java index fe9e86f3..8f23f68e 100755 --- a/common/buildcraft/robots/statements/TriggerRobotSleep.java +++ b/common/buildcraft/robots/statements/TriggerRobotSleep.java @@ -16,6 +16,8 @@ import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; +import buildcraft.api.transport.IPipeTile; +import buildcraft.robots.RobotUtils; import buildcraft.robots.ai.AIRobotSleep; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; @@ -42,15 +44,14 @@ public class TriggerRobotSleep extends BCStatement implements ITriggerInternal { @Override public boolean isTriggerActive(IStatementContainer container, IStatementParameter[] parameters) { - if (!(container instanceof IGate)) { + if (!(container.getTile() instanceof IPipeTile)) { return false; } - Pipe pipe = (Pipe) ((IGate) container).getPipe(); - TileGenericPipe tile = pipe.container; + IPipeTile tile = (IPipeTile) container.getTile(); for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { - DockingStation station = tile.getStation(d); + DockingStation station = RobotUtils.getStation(tile, d); if (station != null && station.robotTaking() != null) { EntityRobot robot = (EntityRobot) station.robotTaking(); From 9c6a38eb6e92d9b04e3f351831967ab081d77e3c Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sat, 24 Jan 2015 23:23:47 +0100 Subject: [PATCH 05/67] filler parameters, early revision --- api/buildcraft/api/filler/IFillerPattern.java | 10 +- api/buildcraft/api/filler/package-info.java | 2 +- api/buildcraft/api/statements/IStatement.java | 12 +- common/buildcraft/BuildCraftBuilders.java | 5 +- common/buildcraft/builders/TileFiller.java | 81 ++++++++++- .../builders/gui/ContainerFiller.java | 2 +- common/buildcraft/builders/gui/GuiFiller.java | 85 +++++++++++- .../builders/statements/ActionFiller.java | 2 +- .../builders/urbanism/UrbanistToolFiller.java | 2 +- .../core/builders/patterns/FillerPattern.java | 37 ++++- .../core/builders/patterns/PatternBox.java | 3 +- .../core/builders/patterns/PatternClear.java | 3 +- .../builders/patterns/PatternCylinder.java | 3 +- .../core/builders/patterns/PatternFill.java | 3 +- .../builders/patterns/PatternFlatten.java | 7 +- .../core/builders/patterns/PatternFrame.java | 3 +- .../builders/patterns/PatternHorizon.java | 7 +- .../patterns/PatternParameterYDir.java | 72 ++++++++++ .../builders/patterns/PatternPyramid.java | 31 +++-- .../core/builders/patterns/PatternStairs.java | 21 ++- .../core/gui/StatementParameterSlot.java | 73 ++++++++++ common/buildcraft/core/gui/StatementSlot.java | 53 ++++++++ common/buildcraft/factory/TileQuarry.java | 3 +- .../transport/gui/GuiGateInterface.java | 126 ++---------------- 24 files changed, 465 insertions(+), 181 deletions(-) create mode 100644 common/buildcraft/core/builders/patterns/PatternParameterYDir.java create mode 100644 common/buildcraft/core/gui/StatementParameterSlot.java create mode 100644 common/buildcraft/core/gui/StatementSlot.java diff --git a/api/buildcraft/api/filler/IFillerPattern.java b/api/buildcraft/api/filler/IFillerPattern.java index 9827db41..da463747 100644 --- a/api/buildcraft/api/filler/IFillerPattern.java +++ b/api/buildcraft/api/filler/IFillerPattern.java @@ -12,13 +12,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.statements.IStatement; -public interface IFillerPattern { - - String getUniqueTag(); - - @SideOnly(Side.CLIENT) - IIcon getIcon(); - - String getDisplayName(); +public interface IFillerPattern extends IStatement { } diff --git a/api/buildcraft/api/filler/package-info.java b/api/buildcraft/api/filler/package-info.java index c05647b4..3709197f 100644 --- a/api/buildcraft/api/filler/package-info.java +++ b/api/buildcraft/api/filler/package-info.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|filler") +@API(apiVersion = "3.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|filler") package buildcraft.api.filler; import cpw.mods.fml.common.API; diff --git a/api/buildcraft/api/statements/IStatement.java b/api/buildcraft/api/statements/IStatement.java index c9c3cd6b..aaadcfe1 100644 --- a/api/buildcraft/api/statements/IStatement.java +++ b/api/buildcraft/api/statements/IStatement.java @@ -17,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly; public interface IStatement { /** - * Every trigger needs a unique tag, it should be in the format of + * Every statement needs a unique tag, it should be in the format of * "<modid>:<name>. * * @return the unique id @@ -31,27 +31,27 @@ public interface IStatement { void registerIcons(IIconRegister iconRegister); /** - * Return the maximum number of parameter this trigger can have, 0 if none. + * Return the maximum number of parameter this statement can have, 0 if none. */ int maxParameters(); /** - * Return the minimum number of parameter this trigger can have, 0 if none. + * Return the minimum number of parameter this statement can have, 0 if none. */ int minParameters(); /** - * Return the trigger description in the UI + * Return the statement description in the UI */ String getDescription(); /** - * Create parameters for the trigger. + * Create parameters for the statement. */ IStatementParameter createParameter(int index); /** - * This returns the trigger after a left rotation. Used in particular in + * This returns the statement after a left rotation. Used in particular in * blueprints orientation. */ IStatement rotateLeft(); diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index d0ef0b3c..981c7fe3 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -135,6 +135,7 @@ import buildcraft.core.builders.patterns.PatternFill; import buildcraft.core.builders.patterns.PatternFlatten; import buildcraft.core.builders.patterns.PatternFrame; import buildcraft.core.builders.patterns.PatternHorizon; +import buildcraft.core.builders.patterns.PatternParameterYDir; import buildcraft.core.builders.patterns.PatternPyramid; import buildcraft.core.builders.patterns.PatternStairs; import buildcraft.core.proxy.CoreProxy; @@ -526,6 +527,8 @@ public class BuildCraftBuilders extends BuildCraftMod { } StatementManager.registerActionProvider(new BuildersActionProvider()); + + StatementManager.registerParameterClass(PatternParameterYDir.class); } public static void loadRecipes() { @@ -576,7 +579,7 @@ public class BuildCraftBuilders extends BuildCraftMod { public void loadTextures(TextureStitchEvent.Pre evt) { if (evt.map.getTextureType() == 0) { for (FillerPattern pattern : FillerPattern.patterns.values()) { - pattern.registerIcon(evt.map); + pattern.registerIcons(evt.map); } } } diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index 8b6ba61b..be977303 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -13,6 +13,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import cpw.mods.fml.relauncher.Side; @@ -20,6 +21,9 @@ import cpw.mods.fml.relauncher.Side; import buildcraft.BuildCraftCore; import buildcraft.api.core.IAreaProvider; import buildcraft.api.filler.FillerManager; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.StatementManager; import buildcraft.api.tiles.IControllable; import buildcraft.api.tiles.IHasWork; import buildcraft.core.Box; @@ -35,11 +39,12 @@ import buildcraft.core.network.ICommandReceiver; import buildcraft.core.network.PacketCommand; import buildcraft.core.utils.Utils; -public class TileFiller extends TileAbstractBuilder implements IHasWork, IControllable, ICommandReceiver { +public class TileFiller extends TileAbstractBuilder implements IHasWork, IControllable, ICommandReceiver, IStatementContainer { private static int POWER_ACTIVATION = 500; public FillerPattern currentPattern = PatternFill.INSTANCE; + public IStatementParameter[] patternParameters; private BptBuilderTemplate currentTemplate; private BptContext context; @@ -76,9 +81,9 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro sendNetworkUpdate(); } - if (currentPattern != null && currentTemplate == null) { + if (currentPattern != null && currentTemplate == null && box.isInitialized()) { currentTemplate = currentPattern - .getTemplateBuilder(box, getWorldObj()); + .getTemplateBuilder(box, getWorldObj(), patternParameters); context = currentTemplate.getContext(); } @@ -121,7 +126,7 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro } if (currentPattern != null && currentTemplate == null) { - currentTemplate = currentPattern.getTemplateBuilder(box, getWorldObj()); + currentTemplate = currentPattern.getTemplateBuilder(box, getWorldObj(), patternParameters); context = currentTemplate.getContext(); } @@ -183,6 +188,12 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro currentPattern = PatternFill.INSTANCE; } + if (nbt.hasKey("pp")) { + readParametersFromNBT(nbt.getCompoundTag("pp")); + } else { + initPatternParameters(); + } + if (nbt.hasKey("box")) { box.initialize(nbt.getCompoundTag("box")); } @@ -218,6 +229,10 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro } nbt.setTag("bpt", bptNBT); + + NBTTagCompound ppNBT = new NBTTagCompound(); + writeParametersToNBT(ppNBT); + nbt.setTag("pp", ppNBT); } @Override @@ -241,27 +256,66 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro destroy(); } + private void initPatternParameters() { + patternParameters = new IStatementParameter[currentPattern.maxParameters()]; + for (int i = 0; i < currentPattern.minParameters(); i++) { + patternParameters[i] = currentPattern.createParameter(i); + } + } + public void setPattern(FillerPattern pattern) { if (pattern != null && currentPattern != pattern) { currentPattern = pattern; currentTemplate = null; done = false; + initPatternParameters(); sendNetworkUpdate(); } } + private void writeParametersToNBT(NBTTagCompound nbt) { + nbt.setByte("length", (byte) (patternParameters != null ? patternParameters.length : 0)); + if (patternParameters != null) { + for (int i = 0; i < patternParameters.length; i++) { + if (patternParameters[i] != null) { + NBTTagCompound patternData = new NBTTagCompound(); + patternData.setString("kind", patternParameters[i].getUniqueTag()); + patternParameters[i].writeToNBT(patternData); + nbt.setTag("p" + i, patternData); + } + } + } + } + + private void readParametersFromNBT(NBTTagCompound nbt) { + patternParameters = new IStatementParameter[nbt.getByte("length")]; + for (int i = 0; i < patternParameters.length; i++) { + if (nbt.hasKey("p" + i)) { + NBTTagCompound patternData = nbt.getCompoundTag("p" + i); + patternParameters[i] = StatementManager.createParameter(patternData.getString("kind")); + patternParameters[i].readFromNBT(patternData); + } + } + } + @Override public void writeData(ByteBuf data) { box.writeData(data); data.writeBoolean(done); Utils.writeUTF(data, currentPattern.getUniqueTag()); + NBTTagCompound parameterData = new NBTTagCompound(); + writeParametersToNBT(parameterData); + Utils.writeNBT(data, parameterData); } @Override public void readData(ByteBuf data) { box.readData(data); done = data.readBoolean(); - setPattern((FillerPattern) FillerManager.registry.getPattern(Utils.readUTF(data))); + FillerPattern pattern = (FillerPattern) FillerManager.registry.getPattern(Utils.readUTF(data)); + NBTTagCompound parameterData = Utils.readNBT(data); + readParametersFromNBT(parameterData); + setPattern(pattern); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } @@ -298,6 +352,9 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro if (side.isServer() && "setPattern".equals(command)) { String name = Utils.readUTF(stream); setPattern((FillerPattern) FillerManager.registry.getPattern(name)); + } else if (side.isServer() && "setParameters".equals(command)) { + NBTTagCompound patternData = Utils.readNBT(stream); + readParametersFromNBT(patternData); } } @@ -328,4 +385,18 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro mode == IControllable.Mode.Loop; } + @Override + public TileEntity getTile() { + return this; + } + + public void rpcSetParameter(int i, IStatementParameter patternParameter) { + BuildCraftCore.instance.sendToServer(new PacketCommand(this, "setParameters", new CommandWriter() { + public void write(ByteBuf data) { + NBTTagCompound parameterData = new NBTTagCompound(); + writeParametersToNBT(parameterData); + Utils.writeNBT(data, parameterData); + } + })); + } } diff --git a/common/buildcraft/builders/gui/ContainerFiller.java b/common/buildcraft/builders/gui/ContainerFiller.java index 4c2928ae..f8108364 100644 --- a/common/buildcraft/builders/gui/ContainerFiller.java +++ b/common/buildcraft/builders/gui/ContainerFiller.java @@ -29,7 +29,7 @@ public class ContainerFiller extends BuildCraftContainer { private class PatternWidget extends Widget { public PatternWidget() { - super(80, 30, 0, 0, 16, 16); + super(38, 30, 0, 0, 16, 16); } @SideOnly(Side.CLIENT) diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index f758225c..99629a16 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -9,29 +9,69 @@ package buildcraft.builders.gui; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.inventory.IInventory; +import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import buildcraft.api.filler.FillerManager; +import buildcraft.api.statements.IStatement; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.StatementMouseClick; import buildcraft.builders.TileFiller; import buildcraft.core.DefaultProps; import buildcraft.core.builders.patterns.FillerPattern; +import buildcraft.core.gui.AdvancedSlot; +import buildcraft.core.gui.GuiAdvancedInterface; import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.gui.GuiTools; +import buildcraft.core.gui.StatementParameterSlot; +import buildcraft.core.gui.StatementSlot; import buildcraft.core.gui.buttons.GuiBetterButton; import buildcraft.core.gui.buttons.StandardButtonTextureSets; import buildcraft.core.utils.StringUtils; +import buildcraft.transport.Pipe; -public class GuiFiller extends GuiBuildCraft { +public class GuiFiller extends GuiAdvancedInterface { + class FillerParameterSlot extends StatementParameterSlot { + public FillerParameterSlot(int x, int y, int slot) { + super(instance, x, y, slot, fakeStatementSlot); + } + + @Override + public IStatementParameter getParameter() { + System.out.println("getParameter " + slot + " " + instance.filler.patternParameters.length); + + if (slot >= instance.filler.patternParameters.length) { + return null; + } else { + return instance.filler.patternParameters[slot]; + } + } + + @Override + public void setParameter(IStatementParameter param, boolean notifyServer) { + // TODO + } + } private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/filler.png"); - IInventory playerInventory; - TileFiller filler; + private final IInventory playerInventory; + private final TileFiller filler; + private final GuiFiller instance; + private final StatementSlot fakeStatementSlot; public GuiFiller(IInventory playerInventory, TileFiller filler) { super(new ContainerFiller(playerInventory, filler), filler, TEXTURE); this.playerInventory = playerInventory; this.filler = filler; + this.instance = this; + this.fakeStatementSlot = new StatementSlot(instance, -1, -1, 0) { + @Override + public IStatement getStatement() { + return instance.filler.currentPattern; + } + }; xSize = 175; ySize = 240; } @@ -41,10 +81,15 @@ public class GuiFiller extends GuiBuildCraft { super.initGui(); buttonList.clear(); - buttonList.add(new GuiBetterButton(0, guiLeft + 80 - 18, guiTop + 30, 10, + buttonList.add(new GuiBetterButton(0, guiLeft + 38 - 18, guiTop + 30, 10, StandardButtonTextureSets.LEFT_BUTTON, "")); - buttonList.add(new GuiBetterButton(1, guiLeft + 80 + 16 + 8, guiTop + 30, 10, + buttonList.add(new GuiBetterButton(1, guiLeft + 38 + 16 + 8, guiTop + 30, 10, StandardButtonTextureSets.RIGHT_BUTTON, "")); + + slots.clear(); + for (int i = 0; i < 4; i++) { + slots.add(new FillerParameterSlot(77 + (i * 18), 30, i)); + } } @Override @@ -61,11 +106,37 @@ public class GuiFiller extends GuiBuildCraft { } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void mouseClicked(int x, int y, int k) { + super.mouseClicked(x, y, k); + + AdvancedSlot slot = getSlotAtLocation(x, y); + + if (slot != null) { + int i = ((FillerParameterSlot) slot).slot; + if (i < filler.patternParameters.length) { + if (filler.patternParameters[i] != null) { + filler.patternParameters[i].onClick(filler, filler.currentPattern, mc.thePlayer.inventory.getItemStack(), + new StatementMouseClick(k, isShiftKeyDown())); + } else { + filler.patternParameters[i] = filler.currentPattern.createParameter(i); + } + filler.rpcSetParameter(i, filler.patternParameters[i]); + } + } + } + + @Override + protected void drawGuiContainerBackgroundLayer(float f, int mx, int my) { + super.drawGuiContainerBackgroundLayer(f, mx, my); + drawBackgroundSlots(); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mx, int my) { String title = StringUtils.localize("tile.fillerBlock.name"); fontRendererObj.drawString(title, getCenteredOffset(title), 6, 0x404040); fontRendererObj.drawString(StringUtils.localize("gui.filling.resources"), 8, 74, 0x404040); fontRendererObj.drawString(StringUtils.localize("gui.inventory"), 8, 142, 0x404040); - GuiTools.drawCenteredString(fontRendererObj, filler.currentPattern.getDisplayName(), 56); + GuiTools.drawCenteredString(fontRendererObj, filler.currentPattern.getDescription(), 56); } } diff --git a/common/buildcraft/builders/statements/ActionFiller.java b/common/buildcraft/builders/statements/ActionFiller.java index 32843ec3..caa545ec 100644 --- a/common/buildcraft/builders/statements/ActionFiller.java +++ b/common/buildcraft/builders/statements/ActionFiller.java @@ -31,7 +31,7 @@ public class ActionFiller extends BCStatement implements IActionExternal { @Override public String getDescription() { - return "Pattern: " + pattern.getDisplayName(); + return "Pattern: " + pattern.getDescription(); } @Override diff --git a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java index fa66b189..aa307659 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java @@ -65,7 +65,7 @@ class UrbanistToolFiller extends UrbanistToolArea { @Override public String getDescription() { - return getPattern().getDisplayName(); + return getPattern().getDescription(); } @Override diff --git a/common/buildcraft/core/builders/patterns/FillerPattern.java b/common/buildcraft/core/builders/patterns/FillerPattern.java index def0e873..ee42b5ee 100644 --- a/common/buildcraft/core/builders/patterns/FillerPattern.java +++ b/common/buildcraft/core/builders/patterns/FillerPattern.java @@ -18,6 +18,8 @@ import net.minecraft.world.World; import buildcraft.api.blueprints.SchematicMask; import buildcraft.api.filler.IFillerPattern; +import buildcraft.api.statements.IStatement; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Blueprint; import buildcraft.core.blueprints.BlueprintBase; @@ -38,16 +40,27 @@ public abstract class FillerPattern implements IFillerPattern { } @Override - public String getDisplayName() { + public String getDescription() { return StringUtils.localize("fillerpattern." + tag); } + @Override + public IStatementParameter createParameter(int index) { + return null; + } + + @Override + public IStatement rotateLeft() { + return this; + } + @Override public String getUniqueTag() { return "buildcraft:" + tag; } - public void registerIcon(IIconRegister iconRegister) { + @Override + public void registerIcons(IIconRegister iconRegister) { icon = iconRegister.registerIcon("buildcraft:fillerPatterns/" + tag); } @@ -56,6 +69,16 @@ public abstract class FillerPattern implements IFillerPattern { return icon; } + @Override + public int maxParameters() { + return 0; + } + + @Override + public int minParameters() { + return 0; + } + @Override public String toString() { return "Pattern: " + getUniqueTag(); @@ -112,13 +135,13 @@ public abstract class FillerPattern implements IFillerPattern { } } - public abstract Template getTemplate (Box box, World world); + public abstract Template getTemplate (Box box, World world, IStatementParameter[] parameters); - public Blueprint getBlueprint (Box box, World world, Block block, int meta) { + public Blueprint getBlueprint (Box box, World world, IStatementParameter[] parameters, Block block, int meta) { Blueprint result = new Blueprint (box.sizeX(), box.sizeY(), box.sizeZ()); try { - Template tmpl = getTemplate(box, world); + Template tmpl = getTemplate(box, world, parameters); for (int x = 0; x < box.sizeX(); ++x) { for (int y = 0; y < box.sizeY(); ++y) { @@ -139,8 +162,8 @@ public abstract class FillerPattern implements IFillerPattern { return result; } - public BptBuilderTemplate getTemplateBuilder (Box box, World world) { - return new BptBuilderTemplate(getTemplate(box, world), world, box.xMin, box.yMin, box.zMin); + public BptBuilderTemplate getTemplateBuilder (Box box, World world, IStatementParameter[] parameters) { + return new BptBuilderTemplate(getTemplate(box, world, parameters), world, box.xMin, box.yMin, box.zMin); } private static boolean isValid (int x, int y, int z, BlueprintBase bpt) { diff --git a/common/buildcraft/core/builders/patterns/PatternBox.java b/common/buildcraft/core/builders/patterns/PatternBox.java index 5d96c6aa..95555ec8 100644 --- a/common/buildcraft/core/builders/patterns/PatternBox.java +++ b/common/buildcraft/core/builders/patterns/PatternBox.java @@ -10,6 +10,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; @@ -21,7 +22,7 @@ public class PatternBox extends FillerPattern { } @Override - public Template getTemplate(Box box, World world) { + public Template getTemplate(Box box, World world, IStatementParameter[] parameters) { Template result = new Template (box.sizeX(), box.sizeY(), box.sizeZ()); int xMin = 0; diff --git a/common/buildcraft/core/builders/patterns/PatternClear.java b/common/buildcraft/core/builders/patterns/PatternClear.java index 1104e6a4..6bdb504c 100644 --- a/common/buildcraft/core/builders/patterns/PatternClear.java +++ b/common/buildcraft/core/builders/patterns/PatternClear.java @@ -10,6 +10,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; @@ -20,7 +21,7 @@ public class PatternClear extends FillerPattern { } @Override - public Template getTemplate (Box box, World world) { + public Template getTemplate (Box box, World world, IStatementParameter[] parameters) { int xMin = (int) box.pMin().x; int yMin = (int) box.pMin().y; int zMin = (int) box.pMin().z; diff --git a/common/buildcraft/core/builders/patterns/PatternCylinder.java b/common/buildcraft/core/builders/patterns/PatternCylinder.java index fddad785..3ed022cc 100644 --- a/common/buildcraft/core/builders/patterns/PatternCylinder.java +++ b/common/buildcraft/core/builders/patterns/PatternCylinder.java @@ -10,6 +10,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; @@ -21,7 +22,7 @@ public class PatternCylinder extends FillerPattern { @Override - public Template getTemplate(Box box, World world) { + public Template getTemplate(Box box, World world, IStatementParameter[] parameters) { Template result = new Template (box.sizeX(), box.sizeY(), box.sizeZ()); int xMin = 0; diff --git a/common/buildcraft/core/builders/patterns/PatternFill.java b/common/buildcraft/core/builders/patterns/PatternFill.java index 7ec079b5..4539c976 100644 --- a/common/buildcraft/core/builders/patterns/PatternFill.java +++ b/common/buildcraft/core/builders/patterns/PatternFill.java @@ -10,6 +10,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; @@ -22,7 +23,7 @@ public final class PatternFill extends FillerPattern { } @Override - public Template getTemplate (Box box, World world) { + public Template getTemplate (Box box, World world, IStatementParameter[] parameters) { Template bpt = new Template(box.sizeX(), box.sizeY(), box.sizeZ()); fill (0, 0, 0, box.sizeX() - 1, box.sizeY() - 1, box.sizeZ() - 1, bpt); diff --git a/common/buildcraft/core/builders/patterns/PatternFlatten.java b/common/buildcraft/core/builders/patterns/PatternFlatten.java index 966f1ff3..77c70926 100644 --- a/common/buildcraft/core/builders/patterns/PatternFlatten.java +++ b/common/buildcraft/core/builders/patterns/PatternFlatten.java @@ -11,6 +11,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; import buildcraft.api.blueprints.SchematicMask; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.BptBuilderTemplate; import buildcraft.core.blueprints.Template; @@ -22,7 +23,7 @@ public class PatternFlatten extends FillerPattern { } @Override - public Template getTemplate (Box box, World world) { + public Template getTemplate (Box box, World world, IStatementParameter[] parameters) { int xMin = (int) box.pMin().x; int yMin = box.pMin().y > 0 ? (int) box.pMin().y - 1 : 0; int zMin = (int) box.pMin().z; @@ -45,9 +46,9 @@ public class PatternFlatten extends FillerPattern { } @Override - public BptBuilderTemplate getTemplateBuilder (Box box, World world) { + public BptBuilderTemplate getTemplateBuilder (Box box, World world, IStatementParameter[] parameters) { int yMin = box.pMin().y > 0 ? (int) box.pMin().y - 1 : 0; - return new BptBuilderTemplate(getTemplate(box, world), world, box.xMin, yMin, box.zMin); + return new BptBuilderTemplate(getTemplate(box, world, parameters), world, box.xMin, yMin, box.zMin); } } diff --git a/common/buildcraft/core/builders/patterns/PatternFrame.java b/common/buildcraft/core/builders/patterns/PatternFrame.java index 0202caf9..dc953bd3 100755 --- a/common/buildcraft/core/builders/patterns/PatternFrame.java +++ b/common/buildcraft/core/builders/patterns/PatternFrame.java @@ -11,6 +11,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; import buildcraft.api.blueprints.SchematicMask; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; @@ -22,7 +23,7 @@ public class PatternFrame extends FillerPattern { } @Override - public Template getTemplate(Box box, World world) { + public Template getTemplate(Box box, World world, IStatementParameter[] parameters) { Template template = new Template (box.sizeX(), box.sizeY(), box.sizeZ()); int xMin = 0; diff --git a/common/buildcraft/core/builders/patterns/PatternHorizon.java b/common/buildcraft/core/builders/patterns/PatternHorizon.java index d6543099..eff3092a 100644 --- a/common/buildcraft/core/builders/patterns/PatternHorizon.java +++ b/common/buildcraft/core/builders/patterns/PatternHorizon.java @@ -11,6 +11,7 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; import buildcraft.api.blueprints.SchematicMask; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.BptBuilderTemplate; import buildcraft.core.blueprints.Template; @@ -22,7 +23,7 @@ public class PatternHorizon extends FillerPattern { } @Override - public Template getTemplate (Box box, World world) { + public Template getTemplate (Box box, World world, IStatementParameter[] parameters) { int xMin = (int) box.pMin().x; int yMin = box.pMin().y > 0 ? (int) box.pMin().y - 1 : 0; int zMin = (int) box.pMin().z; @@ -45,9 +46,9 @@ public class PatternHorizon extends FillerPattern { } @Override - public BptBuilderTemplate getTemplateBuilder (Box box, World world) { + public BptBuilderTemplate getTemplateBuilder (Box box, World world, IStatementParameter[] parameters) { int yMin = box.pMin().y > 0 ? (int) box.pMin().y - 1 : 0; - return new BptBuilderTemplate(getTemplate(box, world), world, box.xMin, yMin, box.zMin); + return new BptBuilderTemplate(getTemplate(box, world, parameters), world, box.xMin, yMin, box.zMin); } } diff --git a/common/buildcraft/core/builders/patterns/PatternParameterYDir.java b/common/buildcraft/core/builders/patterns/PatternParameterYDir.java new file mode 100644 index 00000000..9e278608 --- /dev/null +++ b/common/buildcraft/core/builders/patterns/PatternParameterYDir.java @@ -0,0 +1,72 @@ +package buildcraft.core.builders.patterns; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.IIcon; +import buildcraft.api.statements.IStatement; +import buildcraft.api.statements.IStatementContainer; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.StatementMouseClick; +import buildcraft.core.utils.StringUtils; + +public class PatternParameterYDir implements IStatementParameter { + private static IIcon iconUp, iconDown; + + public boolean up = false; + + public PatternParameterYDir() { + super(); + } + + public PatternParameterYDir(boolean up) { + this(); + this.up = up; + } + + @Override + public String getUniqueTag() { + return "buildcraft:fillerParameterYDir"; + } + + @Override + public IIcon getIcon() { + return up ? iconUp : iconDown; + } + + @Override + public ItemStack getItemStack() { + return null; + } + + @Override + public void registerIcons(IIconRegister iconRegister) { + iconUp = iconRegister.registerIcon("buildcraft:fillerParameters/arrow_up"); + iconDown = iconRegister.registerIcon("buildcraft:fillerParameters/arrow_down"); + } + + @Override + public String getDescription() { + return StringUtils.localize("direction." + (up ? "up" : "down")); + } + + @Override + public void onClick(IStatementContainer source, IStatement stmt, ItemStack stack, StatementMouseClick mouse) { + up = !up; + } + + @Override + public void readFromNBT(NBTTagCompound compound) { + up = compound.getBoolean("up"); + } + + @Override + public void writeToNBT(NBTTagCompound compound) { + compound.setBoolean("up", up); + } + + @Override + public IStatementParameter rotateLeft() { + return null; + } +} diff --git a/common/buildcraft/core/builders/patterns/PatternPyramid.java b/common/buildcraft/core/builders/patterns/PatternPyramid.java index 04b03c90..f03abdfa 100644 --- a/common/buildcraft/core/builders/patterns/PatternPyramid.java +++ b/common/buildcraft/core/builders/patterns/PatternPyramid.java @@ -11,20 +11,32 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; import buildcraft.api.blueprints.SchematicMask; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; public class PatternPyramid extends FillerPattern { - - // TODO: These parameters need to be settable from the filler - private boolean param1 = true; - public PatternPyramid() { super("pyramid"); } @Override - public Template getTemplate (Box box, World world) { + public int maxParameters() { + return 1; + } + + @Override + public int minParameters() { + return 1; + } + + @Override + public IStatementParameter createParameter(int index) { + return new PatternParameterYDir(true); + } + + @Override + public Template getTemplate (Box box, World world, IStatementParameter[] parameters) { int xMin = (int) box.pMin().x; int yMin = (int) box.pMin().y; int zMin = (int) box.pMin().z; @@ -40,13 +52,12 @@ public class PatternPyramid extends FillerPattern { int step = 0; int height; + int stepY; - int stepY = 1; - - if (param1) { - stepY = 1; - } else { + if (parameters[0] != null && !(((PatternParameterYDir) parameters[0]).up)) { stepY = -1; + } else { + stepY = 1; } if (stepY == 1) { diff --git a/common/buildcraft/core/builders/patterns/PatternStairs.java b/common/buildcraft/core/builders/patterns/PatternStairs.java index 63e4c06c..97bb6f10 100644 --- a/common/buildcraft/core/builders/patterns/PatternStairs.java +++ b/common/buildcraft/core/builders/patterns/PatternStairs.java @@ -10,13 +10,13 @@ package buildcraft.core.builders.patterns; import net.minecraft.world.World; +import buildcraft.api.statements.IStatementParameter; import buildcraft.core.Box; import buildcraft.core.blueprints.Template; public class PatternStairs extends FillerPattern { // TODO: These parameters need to be settable from the filler - private boolean param1 = true; private int param2 = 0; private int param3 = 0; private int param4 = 0; @@ -26,7 +26,22 @@ public class PatternStairs extends FillerPattern { } @Override - public Template getTemplate(Box box, World world) { + public int maxParameters() { + return 1; + } + + @Override + public int minParameters() { + return 1; + } + + @Override + public IStatementParameter createParameter(int index) { + return new PatternParameterYDir(true); + } + + @Override + public Template getTemplate(Box box, World world, IStatementParameter[] parameters) { int xMin = 0; int yMin = 0; int zMin = 0; @@ -45,7 +60,7 @@ public class PatternStairs extends FillerPattern { int dimX = 0; int dimZ = 0; - if (param1) { + if (parameters[0] != null && !(((PatternParameterYDir) parameters[0]).up)) { height = yMin; heightStep = 1; } else { diff --git a/common/buildcraft/core/gui/StatementParameterSlot.java b/common/buildcraft/core/gui/StatementParameterSlot.java new file mode 100644 index 00000000..00bd1830 --- /dev/null +++ b/common/buildcraft/core/gui/StatementParameterSlot.java @@ -0,0 +1,73 @@ +package buildcraft.core.gui; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.transport.Pipe; +import buildcraft.transport.gui.GuiGateInterface; + +/** +* Created by asie on 1/24/15. +*/ +public abstract class StatementParameterSlot extends AdvancedSlot { + public int slot; + public StatementSlot statementSlot; + + public StatementParameterSlot(GuiAdvancedInterface gui, int x, int y, int slot, StatementSlot iStatementSlot) { + super(gui, x, y); + + this.slot = slot; + this.statementSlot = iStatementSlot; + statementSlot.parameters.add(this); + } + + @Override + public boolean isDefined() { + return getParameter() != null; + } + + @Override + public String getDescription() { + IStatementParameter parameter = getParameter(); + + if (parameter != null) { + return parameter.getDescription() != null ? parameter.getDescription() : ""; + } else { + return null; + } + } + + @Override + public ItemStack getItemStack() { + IStatementParameter parameter = getParameter(); + + if (parameter != null) { + return parameter.getItemStack(); + } else { + return null; + } + } + + @Override + public IIcon getIcon() { + IStatementParameter parameter = getParameter(); + + if (parameter != null) { + return parameter.getIcon(); + } else { + return null; + } + } + + public abstract IStatementParameter getParameter(); + + public boolean isAllowed() { + return statementSlot.getStatement() != null && slot < statementSlot.getStatement().maxParameters(); + } + + public boolean isRequired() { + return statementSlot.getStatement() != null && slot < statementSlot.getStatement().minParameters(); + } + + public abstract void setParameter(IStatementParameter param, boolean notifyServer); +} diff --git a/common/buildcraft/core/gui/StatementSlot.java b/common/buildcraft/core/gui/StatementSlot.java new file mode 100644 index 00000000..0e9ef022 --- /dev/null +++ b/common/buildcraft/core/gui/StatementSlot.java @@ -0,0 +1,53 @@ +package buildcraft.core.gui; + +import java.util.ArrayList; +import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import buildcraft.api.statements.IStatement; +import buildcraft.transport.Pipe; +import buildcraft.transport.gui.GuiGateInterface; + +/** +* Created by asie on 1/24/15. +*/ +public abstract class StatementSlot extends AdvancedSlot { + public int slot; + public ArrayList parameters = new ArrayList(); + + public StatementSlot(GuiAdvancedInterface gui, int x, int y, int slot) { + super(gui, x, y); + + this.slot = slot; + } + + @Override + public String getDescription() { + IStatement stmt = getStatement(); + + if (stmt != null) { + return stmt.getDescription(); + } else { + return ""; + } + } + + @SideOnly(Side.CLIENT) + @Override + public IIcon getIcon() { + IStatement stmt = getStatement(); + + if (stmt != null) { + return stmt.getIcon(); + } else { + return null; + } + } + + @Override + public boolean isDefined() { + return getStatement() != null; + } + + public abstract IStatement getStatement(); +} diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index e89fd445..85c14614 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -38,6 +38,7 @@ import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.filler.FillerManager; +import buildcraft.api.statements.IStatementParameter; import buildcraft.api.tiles.IControllable; import buildcraft.api.tiles.IHasWork; import buildcraft.api.transport.IPipeConnection; @@ -604,7 +605,7 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI private void initializeBlueprintBuilder() { Blueprint bpt = ((FillerPattern) FillerManager.registry.getPattern("buildcraft:frame")) - .getBlueprint(box, worldObj, BuildCraftFactory.frameBlock, 0); + .getBlueprint(box, worldObj, new IStatementParameter[0], BuildCraftFactory.frameBlock, 0); if (bpt != null) { builder = new BptBuilderBlueprint(bpt, worldObj, box.xMin, yCoord, box.zMin); diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index e73a9f0c..f7498188 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -8,25 +8,21 @@ */ package buildcraft.transport.gui; -import java.util.ArrayList; import java.util.Iterator; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementMouseClick; import buildcraft.core.gui.AdvancedSlot; import buildcraft.core.gui.GuiAdvancedInterface; +import buildcraft.core.gui.StatementParameterSlot; +import buildcraft.core.gui.StatementSlot; import buildcraft.core.utils.StringUtils; import buildcraft.transport.ActionActiveState; import buildcraft.transport.Gate; @@ -34,56 +30,15 @@ import buildcraft.transport.Pipe; import buildcraft.transport.gates.GateDefinition.GateMaterial; public class GuiGateInterface extends GuiAdvancedInterface { - IInventory playerInventory; private final ContainerGateInterface container; + private final GuiGateInterface instance; private final Pipe pipe; private Gate gate; - private abstract class StatementSlot extends AdvancedSlot { - public int slot; - public ArrayList parameters = new ArrayList(); - - public StatementSlot(int x, int y, Pipe pipe, int slot) { - super(GuiGateInterface.this, x, y); - - this.slot = slot; - } - - @Override - public String getDescription() { - IStatement stmt = getStatement(); - - if (stmt != null) { - return stmt.getDescription(); - } else { - return ""; - } - } - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIcon() { - IStatement stmt = getStatement(); - - if (stmt != null) { - return stmt.getIcon(); - } else { - return null; - } - } - - @Override - public boolean isDefined() { - return getStatement() != null; - } - - public abstract IStatement getStatement(); - } - private class TriggerSlot extends StatementSlot { public TriggerSlot(int x, int y, Pipe pipe, int slot) { - super(x, y, pipe, slot); + super(instance, x, y, slot); } @Override @@ -94,7 +49,7 @@ public class GuiGateInterface extends GuiAdvancedInterface { private class ActionSlot extends StatementSlot { public ActionSlot(int x, int y, Pipe pipe, int slot) { - super(x, y, pipe, slot); + super(instance, x, y, slot); } @Override @@ -103,75 +58,9 @@ public class GuiGateInterface extends GuiAdvancedInterface { } } - private abstract class StatementParameterSlot extends AdvancedSlot { - - public Pipe pipe; - public int slot; - public StatementSlot statementSlot; - - public StatementParameterSlot(int x, int y, Pipe pipe, int slot, StatementSlot iStatementSlot) { - super(GuiGateInterface.this, x, y); - - this.pipe = pipe; - this.slot = slot; - this.statementSlot = iStatementSlot; - statementSlot.parameters.add(this); - } - - @Override - public boolean isDefined() { - return getParameter() != null; - } - - @Override - public String getDescription() { - IStatementParameter parameter = getParameter(); - - if (parameter != null) { - return parameter.getDescription() != null ? parameter.getDescription() : ""; - } else { - return null; - } - } - - @Override - public ItemStack getItemStack() { - IStatementParameter parameter = getParameter(); - - if (parameter != null) { - return parameter.getItemStack(); - } else { - return null; - } - } - - @Override - public IIcon getIcon() { - IStatementParameter parameter = getParameter(); - - if (parameter != null) { - return parameter.getIcon(); - } else { - return null; - } - } - - public abstract IStatementParameter getParameter(); - - public boolean isAllowed() { - return statementSlot.getStatement() != null && slot < statementSlot.getStatement().maxParameters(); - } - - public boolean isRequired() { - return statementSlot.getStatement() != null && slot < statementSlot.getStatement().minParameters(); - } - - public abstract void setParameter(IStatementParameter param, boolean notifyServer); - } - class TriggerParameterSlot extends StatementParameterSlot { public TriggerParameterSlot(int x, int y, Pipe pipe, int slot, StatementSlot iStatementSlot) { - super(x, y, pipe, slot, iStatementSlot); + super(instance, x, y, slot, iStatementSlot); } @Override @@ -187,7 +76,7 @@ public class GuiGateInterface extends GuiAdvancedInterface { class ActionParameterSlot extends StatementParameterSlot { public ActionParameterSlot(int x, int y, Pipe pipe, int slot, StatementSlot iStatementSlot) { - super(x, y, pipe, slot, iStatementSlot); + super(instance, x, y, slot, iStatementSlot); } @Override @@ -208,6 +97,7 @@ public class GuiGateInterface extends GuiAdvancedInterface { container.gateCallback = this; this.pipe = pipe; this.playerInventory = playerInventory; + this.instance = this; } public void setGate(Gate gate) { From 173e068ed8a7cc12f83b2a12119120c3e3434f87 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 28 Jan 2015 14:00:42 +0100 Subject: [PATCH 06/67] fix compatibility with Artifice --- common/buildcraft/BuildCraftEnergy.java | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 0c9283ad..651750e7 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -266,8 +266,12 @@ public class BuildCraftEnergy extends BuildCraftMod { } // BucketHandler ensures empty buckets fill with the correct liquid. - BucketHandler.INSTANCE.buckets.put(blockOil, bucketOil); - BucketHandler.INSTANCE.buckets.put(blockFuel, bucketFuel); + if (blockOil != null) { + BucketHandler.INSTANCE.buckets.put(blockOil, bucketOil); + } + if (blockFuel != null) { + BucketHandler.INSTANCE.buckets.put(blockFuel, bucketFuel); + } MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); BuildcraftRecipeRegistry.refinery.addRecipe("buildcraft:fuel", new FluidStack(fluidOil, 1), new FluidStack( @@ -369,9 +373,15 @@ public class BuildCraftEnergy extends BuildCraftMod { @SideOnly(Side.CLIENT) public void textureHook(TextureStitchEvent.Post event) { if (event.map.getTextureType() == 0) { - buildcraftFluidOil.setIcons(blockOil.getBlockTextureFromSide(1), blockOil.getBlockTextureFromSide(2)); - buildcraftFluidFuel.setIcons(blockFuel.getBlockTextureFromSide(1), blockFuel.getBlockTextureFromSide(2)); - buildcraftFluidRedPlasma.setIcons(blockRedPlasma.getBlockTextureFromSide(1), blockRedPlasma.getBlockTextureFromSide(2)); + if (buildcraftFluidOil != null) { + buildcraftFluidOil.setIcons(blockOil.getBlockTextureFromSide(1), blockOil.getBlockTextureFromSide(2)); + } + if (buildcraftFluidFuel != null) { + buildcraftFluidFuel.setIcons(blockFuel.getBlockTextureFromSide(1), blockFuel.getBlockTextureFromSide(2)); + } + if (buildcraftFluidRedPlasma != null) { + buildcraftFluidRedPlasma.setIcons(blockRedPlasma.getBlockTextureFromSide(1), blockRedPlasma.getBlockTextureFromSide(2)); + } } } From 4e2e84990a3c7973fd78f46ca5dd1bb73698acab Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 1 Feb 2015 15:53:48 +0000 Subject: [PATCH 07/67] Add additional pipe sealant recipe using slimeballs --- common/buildcraft/BuildCraftTransport.java | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 827e8758..6b8f5028 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -213,7 +213,7 @@ public class BuildCraftTransport extends BuildCraftMod { public static Item pipePowerDiamond; public static Item pipePowerEmerald; public static Item pipePowerSandstone; - + public static int groupItemsTrigger; public static String[] facadeBlacklist; @@ -238,7 +238,7 @@ public class BuildCraftTransport extends BuildCraftMod { public static boolean debugPrintFacadeList = false; public static float gateCostMultiplier = 1.0F; - + private static LinkedList pipeRecipes = new LinkedList(); public IIconProvider pipeIconProvider = new PipeIconProvider(); @@ -388,7 +388,7 @@ public class BuildCraftTransport extends BuildCraftMod { gateCopier = new ItemGateCopier(); CoreProxy.proxy.registerItem(gateCopier); - + for (PipeContents kind : PipeContents.values()) { triggerPipe[kind.ordinal()] = new TriggerPipeContents(kind); } @@ -452,7 +452,7 @@ public class BuildCraftTransport extends BuildCraftMod { StatementManager.registerParameterClass(ActionParameterSignal.class); StatementManager.registerTriggerProvider(new PipeTriggerProvider()); StatementManager.registerActionProvider(new PipeActionProvider()); - + PipeManager.registerStripesHandler(new StripesHandlerRightClick()); PipeManager.registerStripesHandler(new StripesHandlerBucket()); PipeManager.registerStripesHandler(new StripesHandlerArrow()); @@ -463,7 +463,7 @@ public class BuildCraftTransport extends BuildCraftMod { PipeManager.registerPipePluggable(LensPluggable.class, "lens"); PipeManager.registerPipePluggable(PlugPluggable.class, "plug"); PipeManager.registerPipePluggable(RobotStationPluggable.class, "robotStation"); - + if (BuildCraftCore.loadDefaultRecipes) { loadRecipes(); } @@ -475,7 +475,7 @@ public class BuildCraftTransport extends BuildCraftMod { @Mod.EventHandler public void postInit(FMLPostInitializationEvent evt) { facadeItem.initialize(); - + if (debugPrintFacadeList) { try { PrintWriter writer = new PrintWriter("FacadeDebug.txt", "UTF-8"); @@ -495,6 +495,7 @@ public class BuildCraftTransport extends BuildCraftMod { public void loadRecipes() { // Add base recipe for pipe waterproof. GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.dye, 1, 2)); + GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.slime_ball, 1, 2)); // Add pipe recipes for (PipeRecipe pipe : pipeRecipes) { @@ -506,7 +507,7 @@ public class BuildCraftTransport extends BuildCraftMod { } GameRegistry.addRecipe(new PipeColoringRecipe()); - + CoreProxy.proxy.addCraftingRecipe(new ItemStack(filteredBufferBlock, 1), "wdw", "wcw", "wpw", 'w', "plankWood", 'd', BuildCraftTransport.pipeItemsDiamond, 'c', Blocks.chest, 'p', @@ -525,7 +526,7 @@ public class BuildCraftTransport extends BuildCraftMod { if (Loader.isModLoaded("BuildCraft|Silicon")) { GameRegistry.addShapelessRecipe(new ItemStack(gateCopier, 1), new ItemStack(BuildCraftCore.wrenchItem), Chipset.RED.getStack(1)); - + // PIPE WIRE BuildcraftRecipeRegistry.assemblyTable.addRecipe("buildcraft:redWire", 5000, PipeWire.RED.getStack(8), "dyeRed", "dustRedstone", "ingotIron"); @@ -586,7 +587,7 @@ public class BuildCraftTransport extends BuildCraftMod { BuildcraftRecipeRegistry.assemblyTable.addRecipe("buildcraft:orGate" + materialName, energyCost, ItemGate.makeGateItem(material, GateLogic.OR), inputs); } - + @Mod.EventHandler public void processIMCRequests(IMCEvent event) { InterModComms.processIMC(event); @@ -597,19 +598,19 @@ public class BuildCraftTransport extends BuildCraftMod { Object... ingredients) { ItemPipe res = BlockGenericPipe.registerPipe(clas, creativeTab); res.setUnlocalizedName(clas.getSimpleName()); - + // Add appropriate recipes to temporary list if (ingredients.length == 3) { for (int i = 0; i < 17; i++) { PipeRecipe recipe = new PipeRecipe(); ItemStack glass; - + if (i == 0) { glass = new ItemStack(Blocks.glass); } else { glass = new ItemStack(Blocks.stained_glass, 1, i - 1); } - + recipe.result = new ItemStack(res, 8, i); recipe.input = new Object[]{"ABC", 'A', ingredients[0], 'B', glass, 'C', ingredients[2]}; @@ -618,20 +619,20 @@ public class BuildCraftTransport extends BuildCraftMod { } else if (ingredients.length == 2) { for (int i = 0; i < 17; i++) { PipeRecipe recipe = new PipeRecipe(); - + Object left = ingredients[0]; Object right = ingredients[1]; if (ingredients[1] instanceof ItemPipe) { right = new ItemStack((Item) right, 1, i); } - + recipe.isShapeless = true; recipe.result = new ItemStack(res, 1, i); recipe.input = new Object[]{left, right}; pipeRecipes.add(recipe); - + if (ingredients[1] instanceof ItemPipe) { PipeRecipe uncraft = new PipeRecipe(); uncraft.isShapeless = true; From 969dd1cae93afa2419be4a85f692765408229300 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 1 Feb 2015 15:57:36 +0000 Subject: [PATCH 08/67] Make new recipe configurable --- common/buildcraft/BuildCraftTransport.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 6b8f5028..374ad4c5 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -163,6 +163,7 @@ public class BuildCraftTransport extends BuildCraftMod { public static float pipeDurability; public static int pipeFluidsBaseFlowRate; public static boolean facadeTreatBlacklistAsWhitelist; + public static boolean additionalWaterproofingRecipe; public static BlockGenericPipe genericPipeBlock; public static BlockFilteredBuffer filteredBufferBlock; @@ -263,6 +264,10 @@ public class BuildCraftTransport extends BuildCraftMod { Property printFacadeList = BuildCraftCore.mainConfiguration.get("debug", "facades.printFacadeList", false); debugPrintFacadeList = printFacadeList.getBoolean(); + Property enableAdditionalWaterproofingRecipe = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "pipes.fluids.enableAdditionalWaterproofingRecipe", true); + enableAdditionalWaterproofingRecipe.comment = "Enable the slimeball based pipe waterproofing recipe"; + additionalWaterproofingRecipe = enableAdditionalWaterproofingRecipe.getBoolean(); + gateCostMultiplier = BuildCraftCore.mainConfiguration.getFloat("gate.recipeCostMultiplier", Configuration.CATEGORY_GENERAL, 1.0F, 0.001F, 1000.0F, "The multiplier for gate recipe cost."); filteredBufferBlock = new BlockFilteredBuffer(); @@ -495,6 +500,7 @@ public class BuildCraftTransport extends BuildCraftMod { public void loadRecipes() { // Add base recipe for pipe waterproof. GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.dye, 1, 2)); + if(additionalWaterproofingRecipe) GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.slime_ball, 1, 2)); // Add pipe recipes From 086e99b16740f0a39d2a3ab6416baa350f2b83de Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 1 Feb 2015 16:03:40 +0000 Subject: [PATCH 09/67] Don't create facades for blocks not considered opaque cubes. I feel like there is a hidden reason why this hasn't been implemented, but I can't see it... --- common/buildcraft/transport/ItemFacade.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 8ed0344a..5ed7116a 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -426,6 +426,8 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug if (block == null) { return; } + if (!block.renderAsNormalBlock()) + return; String recipeId = "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#" + itemStack.getItemDamage() + "}"; @@ -564,7 +566,7 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug public int getSpriteNumber() { return 0; } - + @Override public ItemStack getFacadeForBlock(Block block, int metadata) { return getFacade(FacadeState.create(block, metadata)); From a8da61a86bf11d2564631b97eecc170e92eaa9bb Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 1 Feb 2015 16:11:18 +0000 Subject: [PATCH 10/67] Ah, that disallows transparant facades - check rendertype instead --- common/buildcraft/transport/ItemFacade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 5ed7116a..952a8474 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -426,7 +426,7 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug if (block == null) { return; } - if (!block.renderAsNormalBlock()) + if (block.getRenderType() != 0) return; String recipeId = "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#" From 8a43753090b0830a2ffbcc042a57ec1f822be139 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 1 Feb 2015 16:17:16 +0000 Subject: [PATCH 11/67] That's not gonna work - check if the blockmaterial is considered solid instead --- common/buildcraft/transport/ItemFacade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 952a8474..37cc3441 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -426,7 +426,7 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug if (block == null) { return; } - if (block.getRenderType() != 0) + if (!block.getMaterial().blocksMovement()) return; String recipeId = "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#" From f65a28b9682d02fe8cb0a633dfbd2629889b00ea Mon Sep 17 00:00:00 2001 From: big_Xplosion Date: Mon, 2 Feb 2015 16:16:21 +0100 Subject: [PATCH 12/67] Added IMC messages for adding or removing coolants --- common/buildcraft/core/InterModComms.java | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/common/buildcraft/core/InterModComms.java b/common/buildcraft/core/InterModComms.java index ba7d9120..b7bc10f7 100644 --- a/common/buildcraft/core/InterModComms.java +++ b/common/buildcraft/core/InterModComms.java @@ -11,6 +11,8 @@ package buildcraft.core; import java.util.ArrayList; import java.util.List; +import buildcraft.api.fuels.ICoolant; +import buildcraft.energy.fuels.CoolantManager; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Iterables; @@ -25,6 +27,8 @@ import net.minecraft.world.biome.BiomeGenBase; import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import buildcraft.BuildCraftTransport; @@ -66,6 +70,10 @@ public final class InterModComms { processAssemblyRecipeRemoveIMC(event, m); } else if (m.key.equals("remove-refinery-recipe")) { processRefineryRecipeRemoveIMC(event, m); + } else if (m.key.equals("add-coolant")) { + processCoolantAddIMC(event, m); + } else if (m.key.equals("remove-coolant")) { + processCoolantRemoveIMC(event, m); } else { BCLog.logger.warn(String.format("Received an IMC message with unknown key ('%s') from %s!", new Object[]{m.key, m.getSender()})); } @@ -247,4 +255,43 @@ public final class InterModComms { } BCLog.logger.info(String.format("Received a successful oil-gen-exclude request %s from mod %s", m.getStringValue(), m.getSender())); } + + public static void processCoolantAddIMC(IMCEvent event, IMCMessage m) { + boolean failed = false; + if (!m.isNBTMessage()){ + failed = true; + } else { + NBTTagCompound tag = m.getNBTValue(); + if (!tag.hasKey("coolant") || !tag.hasKey("degrees", 3)) { + failed = true; + } else { + Fluid coolant = FluidRegistry.getFluid(tag.getString("coolant")); + if (coolant != null) { + CoolantManager.INSTANCE.addCoolant(coolant, tag.getInteger("degrees")); + } else { + failed = true; + } + } + } + if (failed) { + BCLog.logger.warn("Received invalid coolant IMC message from mod %s!", m.getSender()); + } + } + + public static void processCoolantRemoveIMC(IMCEvent event, IMCMessage m) { + boolean failed = false; + if (m.isStringMessage()) { + ICoolant coolant = CoolantManager.INSTANCE.getCoolant(FluidRegistry.getFluid(m.getStringValue())); + if (coolant != null) { + CoolantManager.INSTANCE.getCoolants().remove(coolant); + } else { + failed = true; + } + } else { + failed = true; + } + if (failed) { + BCLog.logger.warn("Received invalid coolant IMC message from mod %s!", m.getSender()); + } + } } From 57a608fbe8397be85b0e96784db596265f03b169 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Mon, 2 Feb 2015 07:44:52 -0300 Subject: [PATCH 13/67] added a registry for the robot AI classes --- api/buildcraft/api/robots/AIRobot.java | 20 ++- api/buildcraft/api/robots/AIRobotManager.java | 49 ++++++++ common/buildcraft/BuildCraftCore.java | 114 +++++++++++++++++- .../buildcraft/transport/TileGenericPipe.java | 3 +- 4 files changed, 181 insertions(+), 5 deletions(-) create mode 100644 api/buildcraft/api/robots/AIRobotManager.java diff --git a/api/buildcraft/api/robots/AIRobot.java b/api/buildcraft/api/robots/AIRobot.java index 47428c84..f03b6ad3 100755 --- a/api/buildcraft/api/robots/AIRobot.java +++ b/api/buildcraft/api/robots/AIRobot.java @@ -148,7 +148,7 @@ public class AIRobot { } public final void writeToNBT(NBTTagCompound nbt) { - nbt.setString("class", getClass().getCanonicalName()); + nbt.setString("aiName", AIRobotManager.getAIRobotName(getClass())); NBTTagCompound data = new NBTTagCompound(); writeSelfToNBT(data); @@ -169,7 +169,14 @@ public class AIRobot { NBTTagCompound sub = nbt.getCompoundTag("delegateAI"); try { - delegateAI = (AIRobot) Class.forName(sub.getString("class")).getConstructor(EntityRobotBase.class) + Class aiRobotClass = null; + if (sub.hasKey("class")) { + // Migration support for 6.4.x + aiRobotClass = AIRobotManager.getAIRobotByLegacyClassName(sub.getString("class")); + } else { + aiRobotClass = AIRobotManager.getAIRobotByName(sub.getString("aiName")); + } + delegateAI = (AIRobot) aiRobotClass.getConstructor(EntityRobotBase.class) .newInstance(robot); if (delegateAI.canLoadFromNBT()) { @@ -186,7 +193,14 @@ public class AIRobot { AIRobot ai = null; try { - ai = (AIRobot) Class.forName(nbt.getString("class")).getConstructor(EntityRobotBase.class) + Class aiRobotClass = null; + if (nbt.hasKey("class")) { + // Migration support for 6.4.x + aiRobotClass = AIRobotManager.getAIRobotByLegacyClassName(nbt.getString("class")); + } else { + aiRobotClass = AIRobotManager.getAIRobotByName(nbt.getString("aiName")); + } + ai = (AIRobot) aiRobotClass.getConstructor(EntityRobotBase.class) .newInstance(robot); ai.loadFromNBT(nbt); } catch (Throwable e) { diff --git a/api/buildcraft/api/robots/AIRobotManager.java b/api/buildcraft/api/robots/AIRobotManager.java new file mode 100644 index 00000000..927313c8 --- /dev/null +++ b/api/buildcraft/api/robots/AIRobotManager.java @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.api.robots; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +public abstract class AIRobotManager { + + public static ArrayList> aiRobots = new ArrayList>(); + private static Map, String> aiRobotsNames = + new HashMap, String>(); + private static Map> aiRobotsByNames = + new HashMap>(); + private static Map> aiRobotsByLegacyClassNames = + new HashMap>(); + + public static void registerAIRobot(Class aiRobot, String name) { + registerAIRobot(aiRobot, name, null); + } + + public static void registerAIRobot(Class pluggable, String name, String legacyClassName) { + aiRobots.add(pluggable); + aiRobotsByNames.put(name, pluggable); + aiRobotsNames.put(pluggable, name); + if(legacyClassName != null) { + aiRobotsByLegacyClassNames.put(legacyClassName, pluggable); + } + } + + public static Class getAIRobotByName(String pluggableName) { + return aiRobotsByNames.get(pluggableName); + } + + public static String getAIRobotName(Class aClass) { + return aiRobotsNames.get(aClass); + } + + public static Class getAIRobotByLegacyClassName(String string) { + return aiRobotsByLegacyClassNames.get(string); + } +} diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 002311c6..e4c21fd3 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -65,6 +65,7 @@ import buildcraft.api.core.IWorldProperty; import buildcraft.api.core.JavaTools; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.recipes.BuildcraftRecipeRegistry; +import buildcraft.api.robots.AIRobotManager; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatement; @@ -97,7 +98,6 @@ import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.recipes.IntegrationRecipeManager; import buildcraft.core.recipes.RefineryRecipeManager; import buildcraft.core.render.BlockHighlightHandler; -import buildcraft.robots.EntityRobot; import buildcraft.core.statements.ActionMachineControl; import buildcraft.core.statements.ActionRedstoneOutput; import buildcraft.core.statements.DefaultActionProvider; @@ -124,6 +124,62 @@ import buildcraft.core.utils.WorldPropertyIsSoft; import buildcraft.core.utils.WorldPropertyIsWood; import buildcraft.energy.fuels.CoolantManager; import buildcraft.energy.fuels.FuelManager; +import buildcraft.robots.EntityRobot; +import buildcraft.robots.ai.AIRobotAttack; +import buildcraft.robots.ai.AIRobotBreak; +import buildcraft.robots.ai.AIRobotCraftAssemblyTable; +import buildcraft.robots.ai.AIRobotCraftFurnace; +import buildcraft.robots.ai.AIRobotCraftWorkbench; +import buildcraft.robots.ai.AIRobotDeliverRequested; +import buildcraft.robots.ai.AIRobotDisposeItems; +import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; +import buildcraft.robots.ai.AIRobotFetchItem; +import buildcraft.robots.ai.AIRobotGoAndLinkToDock; +import buildcraft.robots.ai.AIRobotGoto; +import buildcraft.robots.ai.AIRobotGotoBlock; +import buildcraft.robots.ai.AIRobotGotoRandomGroundBlock; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotGotoStation; +import buildcraft.robots.ai.AIRobotGotoStationAndLoad; +import buildcraft.robots.ai.AIRobotGotoStationAndLoadFluids; +import buildcraft.robots.ai.AIRobotGotoStationAndUnload; +import buildcraft.robots.ai.AIRobotGotoStationToLoad; +import buildcraft.robots.ai.AIRobotGotoStationToLoadFluids; +import buildcraft.robots.ai.AIRobotGotoStationToUnload; +import buildcraft.robots.ai.AIRobotGotoStationToUnloadFluids; +import buildcraft.robots.ai.AIRobotLoad; +import buildcraft.robots.ai.AIRobotLoadFluids; +import buildcraft.robots.ai.AIRobotMain; +import buildcraft.robots.ai.AIRobotPumpBlock; +import buildcraft.robots.ai.AIRobotRecharge; +import buildcraft.robots.ai.AIRobotSearchAndGotoStation; +import buildcraft.robots.ai.AIRobotSearchBlock; +import buildcraft.robots.ai.AIRobotSearchEntity; +import buildcraft.robots.ai.AIRobotSearchRandomGroundBlock; +import buildcraft.robots.ai.AIRobotSearchStackRequest; +import buildcraft.robots.ai.AIRobotSearchStation; +import buildcraft.robots.ai.AIRobotSleep; +import buildcraft.robots.ai.AIRobotStraightMoveTo; +import buildcraft.robots.ai.AIRobotUnload; +import buildcraft.robots.ai.AIRobotUnloadFluids; +import buildcraft.robots.ai.AIRobotUseToolOnBlock; +import buildcraft.robots.boards.BoardRobotBomber; +import buildcraft.robots.boards.BoardRobotBuilder; +import buildcraft.robots.boards.BoardRobotButcher; +import buildcraft.robots.boards.BoardRobotCarrier; +import buildcraft.robots.boards.BoardRobotCrafter; +import buildcraft.robots.boards.BoardRobotDelivery; +import buildcraft.robots.boards.BoardRobotFarmer; +import buildcraft.robots.boards.BoardRobotFluidCarrier; +import buildcraft.robots.boards.BoardRobotHarvester; +import buildcraft.robots.boards.BoardRobotKnight; +import buildcraft.robots.boards.BoardRobotLeaveCutter; +import buildcraft.robots.boards.BoardRobotLumberjack; +import buildcraft.robots.boards.BoardRobotMiner; +import buildcraft.robots.boards.BoardRobotPicker; +import buildcraft.robots.boards.BoardRobotPlanter; +import buildcraft.robots.boards.BoardRobotPump; +import buildcraft.robots.boards.BoardRobotShovelman; @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.10,1.8)", dependencies = "required-after:Forge@[10.13.0.1207,)") public class BuildCraftCore extends BuildCraftMod { @@ -355,6 +411,62 @@ public class BuildCraftCore extends BuildCraftMod { StatementManager.registerTriggerProvider(new DefaultTriggerProvider()); StatementManager.registerActionProvider(new DefaultActionProvider()); + AIRobotManager.registerAIRobot(AIRobotMain.class, "aiRobotMain","buildcraft.core.robots.AIRobotMain"); + AIRobotManager.registerAIRobot(BoardRobotBomber.class, "boardRobotBomber", "buildcraft.core.robots.boards.BoardRobotBomber"); + AIRobotManager.registerAIRobot(BoardRobotBuilder.class, "boardRobotBuilder", "buildcraft.core.robots.boards.BoardRobotBuilder"); + AIRobotManager.registerAIRobot(BoardRobotButcher.class, "boardRobotButcher", "buildcraft.core.robots.boards.BoardRobotButcher"); + AIRobotManager.registerAIRobot(BoardRobotCarrier.class, "boardRobotCarrier", "buildcraft.core.robots.boards.BoardRobotCarrier"); + AIRobotManager.registerAIRobot(BoardRobotCrafter.class, "boardRobotCrafter", "buildcraft.core.robots.boards.BoardRobotCrafter"); + AIRobotManager.registerAIRobot(BoardRobotDelivery.class, "boardRobotDelivery", "buildcraft.core.robots.boards.BoardRobotDelivery"); + AIRobotManager.registerAIRobot(BoardRobotFarmer.class, "boardRobotFarmer", "buildcraft.core.robots.boards.BoardRobotFarmer"); + AIRobotManager.registerAIRobot(BoardRobotFluidCarrier.class, "boardRobotFluidCarrier", "buildcraft.core.robots.boards.BoardRobotFluidCarrier"); + AIRobotManager.registerAIRobot(BoardRobotHarvester.class, "boardRobotHarvester", "buildcraft.core.robots.boards.BoardRobotHarvester"); + AIRobotManager.registerAIRobot(BoardRobotKnight.class, "boardRobotKnight", "buildcraft.core.robots.boards.BoardRobotKnight"); + AIRobotManager.registerAIRobot(BoardRobotLeaveCutter.class, "boardRobotLeaveCutter", "buildcraft.core.robots.boards.BoardRobotLeaveCutter"); + AIRobotManager.registerAIRobot(BoardRobotLumberjack.class, "boardRobotLumberjack", "buildcraft.core.robots.boards.BoardRobotLumberjack"); + AIRobotManager.registerAIRobot(BoardRobotMiner.class, "boardRobotMiner", "buildcraft.core.robots.boards.BoardRobotMiner"); + AIRobotManager.registerAIRobot(BoardRobotPicker.class, "boardRobotPicker", "buildcraft.core.robots.boards.BoardRobotPicker"); + AIRobotManager.registerAIRobot(BoardRobotPlanter.class, "boardRobotPlanter", "buildcraft.core.robots.boards.BoardRobotPlanter"); + AIRobotManager.registerAIRobot(BoardRobotPump.class, "boardRobotPump", "buildcraft.core.robots.boards.BoardRobotPump"); + AIRobotManager.registerAIRobot(BoardRobotShovelman.class, "boardRobotShovelman", "buildcraft.core.robots.boards.BoardRobotShovelman"); + AIRobotManager.registerAIRobot(AIRobotAttack.class, "aiRobotAttack", "buildcraft.core.robots.AIRobotAttack"); + AIRobotManager.registerAIRobot(AIRobotBreak.class, "aiRobotBreak", "buildcraft.core.robots.AIRobotBreak"); + AIRobotManager.registerAIRobot(AIRobotCraftAssemblyTable.class, "aiRobotCraftAssemblyTable", "buildcraft.core.robots.AIRobotCraftAssemblyTable"); + AIRobotManager.registerAIRobot(AIRobotCraftFurnace.class, "aiRobotCraftFurnace", "buildcraft.core.robots.AIRobotCraftFurnace"); + AIRobotManager.registerAIRobot(AIRobotCraftWorkbench.class, "aiRobotCraftWorkbench", "buildcraft.core.robots.AIRobotCraftWorkbench"); + AIRobotManager.registerAIRobot(AIRobotDeliverRequested.class, "aiRobotDeliverRequested", "buildcraft.core.robots.AIRobotDeliverRequested"); + AIRobotManager.registerAIRobot(AIRobotDisposeItems.class, "aiRobotDisposeItems", "buildcraft.core.robots.AIRobotDisposeItems"); + AIRobotManager.registerAIRobot(AIRobotFetchAndEquipItemStack.class, "aiRobotFetchAndEquipItemStack", "buildcraft.core.robots.AIRobotFetchAndEquipItemStack"); + AIRobotManager.registerAIRobot(AIRobotFetchItem.class, "aiRobotFetchItem", "buildcraft.core.robots.AIRobotFetchItem"); + AIRobotManager.registerAIRobot(AIRobotGoAndLinkToDock.class, "aiRobotGoAndLinkToDock", "buildcraft.core.robots.AIRobotGoAndLinkToDock"); + AIRobotManager.registerAIRobot(AIRobotGoto.class, "aiRobotGoto", "buildcraft.core.robots.AIRobotGoto"); + AIRobotManager.registerAIRobot(AIRobotGotoBlock.class, "aiRobotGotoBlock", "buildcraft.core.robots.AIRobotGotoBlock"); + AIRobotManager.registerAIRobot(AIRobotGotoRandomGroundBlock.class, "aiRobotGotoRandomGroundBlock", "buildcraft.core.robots.AIRobotGotoRandomGroundBlock"); + AIRobotManager.registerAIRobot(AIRobotGotoSleep.class, "aiRobotGotoSleep", "buildcraft.core.robots.AIRobotGotoSleep"); + AIRobotManager.registerAIRobot(AIRobotGotoStation.class, "aiRobotGotoStation", "buildcraft.core.robots.AIRobotGotoStation"); + AIRobotManager.registerAIRobot(AIRobotGotoStationAndLoad.class, "aiRobotGotoStationAndLoad", "buildcraft.core.robots.AIRobotGotoStationAndLoad"); + AIRobotManager.registerAIRobot(AIRobotGotoStationAndLoadFluids.class, "aiRobotGotoStationAndLoadFluids", "buildcraft.core.robots.AIRobotGotoStationAndLoadFluids"); + AIRobotManager.registerAIRobot(AIRobotGotoStationAndUnload.class, "aiRobotGotoStationAndUnload", "buildcraft.core.robots.AIRobotGotoStationAndUnload"); + AIRobotManager.registerAIRobot(AIRobotGotoStationToLoad.class, "aiRobotGotoStationToLoad", "buildcraft.core.robots.AIRobotGotoStationToLoad"); + AIRobotManager.registerAIRobot(AIRobotGotoStationToLoadFluids.class, "aiRobotGotoStationToLoadFluids", "buildcraft.core.robots.AIRobotGotoStationToLoadFluids"); + AIRobotManager.registerAIRobot(AIRobotGotoStationToUnload.class, "aiRobotGotoStationToUnload", "buildcraft.core.robots.AIRobotGotoStationToUnload"); + AIRobotManager.registerAIRobot(AIRobotGotoStationToUnloadFluids.class, "aiRobotGotoStationToUnloadFluids", "buildcraft.core.robots.AIRobotGotoStationToUnloadFluids"); + AIRobotManager.registerAIRobot(AIRobotLoad.class, "aiRobotLoad", "buildcraft.core.robots.AIRobotLoad"); + AIRobotManager.registerAIRobot(AIRobotLoadFluids.class, "aiRobotLoadFluids", "buildcraft.core.robots.AIRobotLoadFluids"); + AIRobotManager.registerAIRobot(AIRobotPumpBlock.class, "aiRobotPumpBlock", "buildcraft.core.robots.AIRobotPumpBlock"); + AIRobotManager.registerAIRobot(AIRobotRecharge.class, "aiRobotRecharge", "buildcraft.core.robots.AIRobotRecharge"); + AIRobotManager.registerAIRobot(AIRobotSearchAndGotoStation.class, "aiRobotSearchAndGotoStation", "buildcraft.core.robots.AIRobotSearchAndGotoStation"); + AIRobotManager.registerAIRobot(AIRobotSearchBlock.class, "aiRobotSearchBlock", "buildcraft.core.robots.AIRobotSearchBlock"); + AIRobotManager.registerAIRobot(AIRobotSearchEntity.class, "aiRobotSearchEntity", "buildcraft.core.robots.AIRobotSearchEntity"); + AIRobotManager.registerAIRobot(AIRobotSearchRandomGroundBlock.class, "aiRobotSearchRandomGroundBlock", "buildcraft.core.robots.AIRobotSearchRandomGroundBlock"); + AIRobotManager.registerAIRobot(AIRobotSearchStackRequest.class, "aiRobotSearchStackRequest", "buildcraft.core.robots.AIRobotSearchStackRequest"); + AIRobotManager.registerAIRobot(AIRobotSearchStation.class, "aiRobotSearchStation", "buildcraft.core.robots.AIRobotSearchStation"); + AIRobotManager.registerAIRobot(AIRobotSleep.class, "aiRobotSleep", "buildcraft.core.robots.AIRobotSleep"); + AIRobotManager.registerAIRobot(AIRobotStraightMoveTo.class, "aiRobotStraightMoveTo", "buildcraft.core.robots.AIRobotStraightMoveTo"); + AIRobotManager.registerAIRobot(AIRobotUnload.class, "aiRobotUnload", "buildcraft.core.robots.AIRobotUnload"); + AIRobotManager.registerAIRobot(AIRobotUnloadFluids.class, "aiRobotUnloadFluids", "buildcraft.core.robots.AIRobotUnloadFluids"); + AIRobotManager.registerAIRobot(AIRobotUseToolOnBlock.class, "aiRobotUseToolOnBlock", "buildcraft.core.robots.AIRobotUseToolOnBlock"); + if (BuildCraftCore.modifyWorld) { MinecraftForge.EVENT_BUS.register(new SpringPopulate()); } diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 89b9e2dc..0723645c 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -141,7 +141,8 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, pluggableClass = FacadePluggable.class; } else if ("buildcraft.transport.ItemPlug$PlugPluggable".equals(c)) { pluggableClass = PlugPluggable.class; - } else if ("buildcraft.transport.gates.ItemRobotStation$RobotStationPluggable".equals(c)) { + } else if ("buildcraft.transport.gates.ItemRobotStation$RobotStationPluggable".equals(c) + || "buildcraft.transport.ItemRobotStation$RobotStationPluggable".equals(c)) { pluggableClass = PipeManager.getPluggableByName("robotStation"); } } else { From c873857807f7a9983c7e35427c0189db49f14f2d Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Mon, 2 Feb 2015 07:48:02 -0300 Subject: [PATCH 14/67] new path finding algorithm for the block breaking robots --- .../utils/concurrency/IIterableAlgorithm.java | 17 ++ .../IterableAlgorithmRunner.java} | 11 +- .../utils/{ => concurrency}/PathFinding.java | 91 +-------- .../utils/concurrency/PathFindingSearch.java | 188 ++++++++++++++++++ common/buildcraft/robots/EntityRobot.java | 4 + .../robots/ai/AIRobotGotoBlock.java | 8 +- .../ai/AIRobotGotoRandomGroundBlock.java | 8 +- .../robots/ai/AIRobotSearchBlock.java | 18 +- .../robots/boards/BoardRobotFarmer.java | 10 +- .../boards/BoardRobotGenericBreakBlock.java | 3 +- .../robots/boards/BoardRobotPlanter.java | 8 +- .../robots/boards/BoardRobotPump.java | 7 +- 12 files changed, 256 insertions(+), 117 deletions(-) create mode 100644 common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java rename common/buildcraft/core/utils/{PathFindingJob.java => concurrency/IterableAlgorithmRunner.java} (80%) rename common/buildcraft/core/utils/{ => concurrency}/PathFinding.java (76%) create mode 100644 common/buildcraft/core/utils/concurrency/PathFindingSearch.java diff --git a/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java b/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java new file mode 100644 index 00000000..4bfe6427 --- /dev/null +++ b/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java @@ -0,0 +1,17 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.utils.concurrency; + +public interface IIterableAlgorithm { + + abstract void iterate(); + + abstract boolean isDone(); + +} \ No newline at end of file diff --git a/common/buildcraft/core/utils/PathFindingJob.java b/common/buildcraft/core/utils/concurrency/IterableAlgorithmRunner.java similarity index 80% rename from common/buildcraft/core/utils/PathFindingJob.java rename to common/buildcraft/core/utils/concurrency/IterableAlgorithmRunner.java index 3febe645..0ca1d528 100755 --- a/common/buildcraft/core/utils/PathFindingJob.java +++ b/common/buildcraft/core/utils/concurrency/IterableAlgorithmRunner.java @@ -6,33 +6,32 @@ * 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.utils; +package buildcraft.core.utils.concurrency; import java.util.Date; -public class PathFindingJob extends Thread { +public class IterableAlgorithmRunner extends Thread { - private PathFinding pathFinding; + private IIterableAlgorithm pathFinding; private boolean stop = false; private int maxIterations; private boolean done = false; - public PathFindingJob(PathFinding iPathFinding, int iMaxIterations) { + public IterableAlgorithmRunner(IIterableAlgorithm iPathFinding, int iMaxIterations) { super("Path Finding"); pathFinding = iPathFinding; maxIterations = iMaxIterations; } - public PathFindingJob(PathFinding iPathFinding) { + public IterableAlgorithmRunner(IIterableAlgorithm iPathFinding) { this(iPathFinding, 1000); } @Override public void run() { try { - pathFinding.preRun(); for (int i = 0; i < maxIterations; ++i) { if (isTerminated() || pathFinding.isDone()) { break; diff --git a/common/buildcraft/core/utils/PathFinding.java b/common/buildcraft/core/utils/concurrency/PathFinding.java similarity index 76% rename from common/buildcraft/core/utils/PathFinding.java rename to common/buildcraft/core/utils/concurrency/PathFinding.java index 4ac5b5e1..427414c7 100755 --- a/common/buildcraft/core/utils/PathFinding.java +++ b/common/buildcraft/core/utils/concurrency/PathFinding.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.utils; +package buildcraft.core.utils.concurrency; import java.util.ArrayList; import java.util.Collection; @@ -17,26 +17,23 @@ import net.minecraft.world.World; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.IZone; +import buildcraft.core.utils.IBlockFilter; /** * This class implements a 3D path finding based on the A* algorithm, following * guidelines documented on http://www.policyalmanac.org/games/aStarTutorial.htm * . */ -public class PathFinding { +public class PathFinding implements IIterableAlgorithm { public static int PATH_ITERATIONS = 1000; private World world; private BlockIndex start; private BlockIndex end; - private BlockIndex boxEnd; private IBlockFilter pathFound; - private float maxDistance = -1; - private float sqrMaxDistance = -1; private IZone zone; private double maxDistanceToEnd = 0; - private boolean targetNotFound; private HashMap openList = new HashMap(); private HashMap closedList = new HashMap(); @@ -68,58 +65,7 @@ public class PathFinding { maxDistanceToEnd = iMaxDistanceToEnd; } - // TODO: It's probably more efficient to start a search first, and then to - // compute the path, instead of computing all possible path from the get - // go. - public PathFinding(World iWorld, BlockIndex iStart, IBlockFilter iPathFound, float iMaxDistance, IZone iZone) { - world = iWorld; - start = iStart; - pathFound = iPathFound; - - Node startNode = new Node(); - startNode.parent = null; - startNode.movementCost = 0; - startNode.destinationCost = 0; - startNode.totalWeight = startNode.movementCost + startNode.destinationCost; - startNode.index = iStart; - openList.put(start, startNode); - nextIteration = startNode; - maxDistance = iMaxDistance; - sqrMaxDistance = maxDistance * maxDistance; - maxDistance = maxDistance * 1.25f; - zone = iZone; - targetNotFound = false; - } - - public void preRun() { - if (end == null) { - targetNotFound = searchForTarget(64); - } - } - - - private boolean searchForTarget(int range) { - for (int dx = -range; dx <= range; dx++) { - for (int dz = -range; dz <= range; dz++) { - int x = start.x + dx; - int z = start.z + dz; - if (world.getChunkProvider().chunkExists (x >> 4, z >> 4)) { - int height = world.getChunkFromChunkCoords(x >> 4, z >> 4).getHeightValue(x & 0xF, z & 0xF); - for (int dy = -range; dy <= height; dy++) { - int y = Math.max(0, start.y + dy); - if (zone != null && !zone.contains(x, y, z)) { - continue; - } - if (pathFound.matches(world, x, y, z)) { - return false; - } - } - } - } - } - return true; - } - + @Override public void iterate() { iterate(PATH_ITERATIONS); } @@ -145,8 +91,9 @@ public class PathFinding { } } + @Override public boolean isDone() { - return nextIteration == null || (end == null && targetNotFound); + return nextIteration == null; } public LinkedList getResult() { @@ -400,33 +347,7 @@ public class PathFinding { resultMoves[2][2][2] = 0; } - - if (maxDistance != -1) { - for (int dx = -1; dx <= +1; ++dx) { - for (int dy = -1; dy <= +1; ++dy) { - for (int dz = -1; dz <= +1; ++dz) { - int x = from.index.x + dx; - int y = from.index.y + dy; - int z = from.index.z + dz; - - float distX = x - start.x; - float distY = y - start.y; - float distZ = z - start.z; - float sqrDist = distX * distX + distY * distY + distZ * distZ; - - if (sqrDist > sqrMaxDistance) { - resultMoves[dx + 1][dy + 1][dz + 1] = 0; - } - } - } - } - } - return resultMoves; } - private boolean totalDistanceExceeded(Node nextNode) { - return maxDistance != -1 && nextNode.totalWeight > maxDistance; - } - } diff --git a/common/buildcraft/core/utils/concurrency/PathFindingSearch.java b/common/buildcraft/core/utils/concurrency/PathFindingSearch.java new file mode 100644 index 00000000..340d8236 --- /dev/null +++ b/common/buildcraft/core/utils/concurrency/PathFindingSearch.java @@ -0,0 +1,188 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.utils.concurrency; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.world.World; + +import buildcraft.api.core.BlockIndex; +import buildcraft.api.core.BuildCraftAPI; +import buildcraft.api.core.IZone; +import buildcraft.core.utils.IBlockFilter; + +public class PathFindingSearch implements IIterableAlgorithm { + + public static int PATH_ITERATIONS = 1000; + + private static HashMap> reservations = new HashMap>(); + + private World world; + private BlockIndex start; + private List pathFinders; + private IBlockFilter pathFound; + private IZone zone; + + private int searchRadius; + private int searchX; + private int searchY; + private int searchZ; + private int searchHeight; + + public PathFindingSearch(World iWorld, BlockIndex iStart, IBlockFilter iPathFound, float iMaxDistance, IZone iZone) { + world = iWorld; + start = iStart; + pathFound = iPathFound; + + pathFinders = new LinkedList(); + searchRadius = 1; + searchX = -1; + searchY = -1; + searchZ = -1; + getSearchHeight(start.x + searchX, start.z + searchZ); + } + + @Override + public void iterate() { + if (pathFinders.size() < 5 && searchRadius < 64) { + iterateSearch(PATH_ITERATIONS * 50); + } + iteratePathFind(PATH_ITERATIONS); + } + + private void iterateSearch(int itNumber) { + for (int i = 0; i < itNumber; ++i) { + int currX = start.x + searchX; + int currY = start.y + searchY; + int currZ = start.z + searchZ; + if (0 <= currY && currY <= searchHeight) { + if (isTarget(currX, currY, currZ)) { + pathFinders.add(new PathFinding(world, start, new BlockIndex(currX, currY, currZ))); + } + } + + searchY += 1; + if (searchY > searchRadius) { + searchY = -searchRadius; + searchZ += 1; + if (searchZ > searchRadius) { + searchZ = -searchRadius; + searchX += 1; + if (searchX > searchRadius) { + searchRadius += 1; + searchX = -searchRadius; + searchY = -searchRadius; + searchZ = -searchRadius; + } + } + searchHeight = getSearchHeight(start.x + searchX, start.z + searchZ); + } + if (pathFinders.size() >= 5) { + return; + } + } + } + + private boolean isTarget(int x, int y, int z) { + if (zone != null && !zone.contains(x, y, z)) { + return false; + } + if (!pathFound.matches(world, x, y, z)) { + return false; + } + synchronized (reservations) { + if (reservations.containsKey(world.provider.dimensionId)) { + HashSet dimReservations = reservations + .get(world.provider.dimensionId); + if (dimReservations.contains(new BlockIndex(x, y, z))) { + return false; + } + } + } + if (!BuildCraftAPI.isSoftBlock(world, x - 1, y, z) + && !BuildCraftAPI.isSoftBlock(world, x + 1, y, z) + && !BuildCraftAPI.isSoftBlock(world, x, y, z - 1) + && !BuildCraftAPI.isSoftBlock(world, x, y, z + 1) + && !BuildCraftAPI.isSoftBlock(world, x, y - 1, z) + && !BuildCraftAPI.isSoftBlock(world, x, y + 1, z)) { + return false; + } + return true; + } + + private int getSearchHeight(int x, int z) { + if (world.getChunkProvider().chunkExists(x >> 4, z >> 4)) { + return 256; + } else { + return -1; + } + } + + public void iteratePathFind(int itNumber) { + for (PathFinding pathFinding : new ArrayList(pathFinders)) { + pathFinding.iterate(itNumber / pathFinders.size()); + if (pathFinding.isDone()) { + LinkedList path = pathFinding.getResult(); + if (path != null && path.size() > 0) { + if (reserve(path.getLast())) { + return; + } + } + pathFinders.remove(pathFinding); + } + } + } + + @Override + public boolean isDone() { + for (PathFinding pathFinding : pathFinders) { + if (pathFinding.isDone()) { + return true; + } + } + return searchRadius >= 64; + } + + public LinkedList getResult() { + for (PathFinding pathFinding : pathFinders) { + if (pathFinding.isDone()) { + return pathFinding.getResult(); + } + } + return new LinkedList(); + } + + private boolean reserve(BlockIndex block) { + synchronized (reservations) { + if (!reservations.containsKey(world.provider.dimensionId)) { + reservations.put(world.provider.dimensionId, + new HashSet()); + } + HashSet dimReservations = reservations + .get(world.provider.dimensionId); + if (dimReservations.contains(block)) { + return false; + } + dimReservations.add(block); + return true; + } + } + + public void unreserve(BlockIndex block) { + synchronized (reservations) { + if (reservations.containsKey(world.provider.dimensionId)) { + reservations.get(world.provider.dimensionId).remove(block); + } + } + } +} diff --git a/common/buildcraft/robots/EntityRobot.java b/common/buildcraft/robots/EntityRobot.java index b5b48692..426144d9 100644 --- a/common/buildcraft/robots/EntityRobot.java +++ b/common/buildcraft/robots/EntityRobot.java @@ -247,6 +247,7 @@ public class EntityRobot extends EntityRobotBase implements @Override public void onEntityUpdate() { + this.worldObj.theProfiler.startSection("bcEntityRobot"); if (!firstUpdateDone) { firstUpdate(); firstUpdateDone = true; @@ -305,7 +306,9 @@ public class EntityRobot extends EntityRobotBase implements } if (linkedDockingStation != null) { + this.worldObj.theProfiler.startSection("bcRobotAIMainCycle"); mainAI.cycle(); + this.worldObj.theProfiler.endSection(); if (energySpendPerCycle != mainAI.getActiveAI().getEnergyCost()) { energySpendPerCycle = mainAI.getActiveAI().getEnergyCost(); @@ -319,6 +322,7 @@ public class EntityRobot extends EntityRobotBase implements } super.onEntityUpdate(); + this.worldObj.theProfiler.endSection(); } @SideOnly(Side.CLIENT) private void spawnEnergyFX() { diff --git a/common/buildcraft/robots/ai/AIRobotGotoBlock.java b/common/buildcraft/robots/ai/AIRobotGotoBlock.java index 1ec5f66e..cb043a35 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoBlock.java +++ b/common/buildcraft/robots/ai/AIRobotGotoBlock.java @@ -17,15 +17,15 @@ import net.minecraftforge.common.util.Constants; import buildcraft.api.core.BlockIndex; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.core.utils.PathFinding; -import buildcraft.core.utils.PathFindingJob; +import buildcraft.core.utils.concurrency.IterableAlgorithmRunner; +import buildcraft.core.utils.concurrency.PathFinding; public class AIRobotGotoBlock extends AIRobotGoto { public boolean unreachable = false; private PathFinding pathSearch; - private PathFindingJob pathSearchJob; + private IterableAlgorithmRunner pathSearchJob; private LinkedList path; private double prevDistance = Double.MAX_VALUE; private float finalX, finalY, finalZ; @@ -70,7 +70,7 @@ public class AIRobotGotoBlock extends AIRobotGoto { (int) Math.floor(robot.posY), (int) Math.floor(robot.posZ)), new BlockIndex( (int) Math.floor(finalX), (int) Math.floor(finalY), (int) Math.floor(finalZ)), maxDistance); - pathSearchJob = new PathFindingJob(pathSearch, 100); + pathSearchJob = new IterableAlgorithmRunner(pathSearch, 100); pathSearchJob.start(); } else if (path != null) { double distance = robot.getDistance(nextX, nextY, nextZ); diff --git a/common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java b/common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java index 2b364cac..e8f69530 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java +++ b/common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java @@ -15,8 +15,8 @@ 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; +import buildcraft.core.utils.concurrency.IterableAlgorithmRunner; +import buildcraft.core.utils.concurrency.PathFinding; public class AIRobotGotoRandomGroundBlock extends AIRobot { @@ -24,7 +24,7 @@ public class AIRobotGotoRandomGroundBlock extends AIRobot { private int range; private PathFinding pathFinding; - private PathFindingJob pathFindingJob; + private IterableAlgorithmRunner pathFindingJob; private IBlockFilter filter; private IZone zone; @@ -68,7 +68,7 @@ public class AIRobotGotoRandomGroundBlock extends AIRobot { blockFound = aiFind.blockFound; pathFinding = new PathFinding(robot.worldObj, new BlockIndex(robot), blockFound); - pathFindingJob = new PathFindingJob(pathFinding); + pathFindingJob = new IterableAlgorithmRunner(pathFinding); pathFindingJob.start(); } else if (ai instanceof AIRobotGotoBlock) { terminate(); diff --git a/common/buildcraft/robots/ai/AIRobotSearchBlock.java b/common/buildcraft/robots/ai/AIRobotSearchBlock.java index a2b69e5e..054a3d96 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchBlock.java @@ -16,17 +16,16 @@ 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; +import buildcraft.core.utils.concurrency.IterableAlgorithmRunner; +import buildcraft.core.utils.concurrency.PathFindingSearch; public class AIRobotSearchBlock extends AIRobot { public BlockIndex blockFound; public LinkedList path; - private PathFinding blockScanner = null; - private PathFindingJob blockScannerJob; + private PathFindingSearch blockScanner = null; + private IterableAlgorithmRunner blockScannerJob; private IBlockFilter pathFound; - private int stopBefore = 0; public AIRobotSearchBlock(EntityRobotBase iRobot) { super(iRobot); @@ -36,13 +35,12 @@ public class AIRobotSearchBlock extends AIRobot { super(iRobot); pathFound = iPathFound; - stopBefore = 0; } @Override public void start() { - blockScanner = new PathFinding(robot.worldObj, new BlockIndex(robot), pathFound, 64, robot.getZoneToWork()); - blockScannerJob = new PathFindingJob(blockScanner); + blockScanner = new PathFindingSearch(robot.worldObj, new BlockIndex(robot), pathFound, 64, robot.getZoneToWork()); + blockScannerJob = new IterableAlgorithmRunner(blockScanner, 40000); blockScannerJob.start(); } @@ -94,4 +92,8 @@ public class AIRobotSearchBlock extends AIRobot { blockFound = new BlockIndex(nbt.getCompoundTag("blockFound")); } } + + public void unreserve() { + blockScanner.unreserve(blockFound); + } } diff --git a/common/buildcraft/robots/boards/BoardRobotFarmer.java b/common/buildcraft/robots/boards/BoardRobotFarmer.java index 1f74889b..1afbbb56 100644 --- a/common/buildcraft/robots/boards/BoardRobotFarmer.java +++ b/common/buildcraft/robots/boards/BoardRobotFarmer.java @@ -20,13 +20,13 @@ import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.utils.IBlockFilter; +import buildcraft.robots.ResourceIdBlock; 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 { @@ -71,6 +71,7 @@ public class BoardRobotFarmer extends RedstoneBoardRobot { if (searchAI.blockFound != null && RobotRegistry.getRegistry(robot.worldObj).take( new ResourceIdBlock(searchAI.blockFound), robot)) { + ((AIRobotSearchBlock) ai).unreserve(); if (blockFound != null) { robot.getRegistry().release(new ResourceIdBlock(blockFound)); @@ -79,11 +80,12 @@ public class BoardRobotFarmer extends RedstoneBoardRobot { blockFound = searchAI.blockFound; startDelegateAI(new AIRobotGotoBlock(robot, searchAI.path)); } else { + if (searchAI.blockFound != null) { + ((AIRobotSearchBlock) ai).unreserve(); + } startDelegateAI(new AIRobotGotoSleep(robot)); } } else if (ai instanceof AIRobotGotoBlock) { - AIRobotGotoBlock gotoBlock = (AIRobotGotoBlock) ai; - startDelegateAI(new AIRobotUseToolOnBlock(robot, blockFound)); } else if (ai instanceof AIRobotFetchAndEquipItemStack) { if (robot.getHeldItem() == null) { diff --git a/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java index f403f673..6228c6c5 100644 --- a/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java +++ b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java @@ -23,13 +23,13 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.utils.IBlockFilter; 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; @@ -104,6 +104,7 @@ public abstract class BoardRobotGenericBreakBlock extends RedstoneBoardRobot { if (robot.getRegistry().take(new ResourceIdBlock(indexStored), robot)) { startDelegateAI(new AIRobotGotoBlock(robot, ((AIRobotSearchBlock) ai).path)); } + ((AIRobotSearchBlock) ai).unreserve(); } } else if (ai instanceof AIRobotGotoBlock) { startDelegateAI(new AIRobotBreak(robot, indexStored)); diff --git a/common/buildcraft/robots/boards/BoardRobotPlanter.java b/common/buildcraft/robots/boards/BoardRobotPlanter.java index e9d0d393..c7db83a2 100644 --- a/common/buildcraft/robots/boards/BoardRobotPlanter.java +++ b/common/buildcraft/robots/boards/BoardRobotPlanter.java @@ -31,15 +31,14 @@ import buildcraft.core.inventory.filters.ArrayStackFilter; 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.utils.IBlockFilter; +import buildcraft.robots.ResourceIdBlock; 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.robots.ResourceIdBlock; import buildcraft.robots.statements.ActionRobotFilter; public class BoardRobotPlanter extends RedstoneBoardRobot { @@ -140,10 +139,15 @@ public class BoardRobotPlanter extends RedstoneBoardRobot { robot.getRegistry().release(new ResourceIdBlock(blockFound)); } + ((AIRobotSearchBlock) ai).unreserve(); + blockFound = gotoBlock.blockFound; gotoBlock.path.removeLast(); startDelegateAI(new AIRobotGotoBlock(robot, gotoBlock.path)); } else { + if (gotoBlock.blockFound != null) { + gotoBlock.unreserve(); + } startDelegateAI(new AIRobotGotoSleep(robot)); } } else if (ai instanceof AIRobotGotoBlock) { diff --git a/common/buildcraft/robots/boards/BoardRobotPump.java b/common/buildcraft/robots/boards/BoardRobotPump.java index eabbb2bf..21e7abe3 100644 --- a/common/buildcraft/robots/boards/BoardRobotPump.java +++ b/common/buildcraft/robots/boards/BoardRobotPump.java @@ -28,14 +28,14 @@ import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; +import buildcraft.core.utils.IBlockFilter; +import buildcraft.robots.DockingStation; +import buildcraft.robots.ResourceIdBlock; 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; @@ -92,6 +92,7 @@ public class BoardRobotPump extends RedstoneBoardRobot { } else { startDelegateAI(new AIRobotGotoBlock(robot, ((AIRobotSearchBlock) ai).path)); } + ((AIRobotSearchBlock) ai).unreserve(); } } else if (ai instanceof AIRobotGotoBlock) { if (!ai.success()) { From d362a062a932dbdb52c0ecf3f2dc7f36027e2caa Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Tue, 3 Feb 2015 22:46:21 -0300 Subject: [PATCH 15/67] added a registry for the robot ResourceId classes --- api/buildcraft/api/robots/AIRobot.java | 10 +- api/buildcraft/api/robots/AIRobotManager.java | 49 -------- api/buildcraft/api/robots/ResourceId.java | 12 +- api/buildcraft/api/robots/RobotManager.java | 80 ++++++++++++ common/buildcraft/BuildCraftCore.java | 118 +++++++++--------- 5 files changed, 156 insertions(+), 113 deletions(-) delete mode 100644 api/buildcraft/api/robots/AIRobotManager.java create mode 100644 api/buildcraft/api/robots/RobotManager.java diff --git a/api/buildcraft/api/robots/AIRobot.java b/api/buildcraft/api/robots/AIRobot.java index f03b6ad3..68420eab 100755 --- a/api/buildcraft/api/robots/AIRobot.java +++ b/api/buildcraft/api/robots/AIRobot.java @@ -148,7 +148,7 @@ public class AIRobot { } public final void writeToNBT(NBTTagCompound nbt) { - nbt.setString("aiName", AIRobotManager.getAIRobotName(getClass())); + nbt.setString("aiName", RobotManager.getAIRobotName(getClass())); NBTTagCompound data = new NBTTagCompound(); writeSelfToNBT(data); @@ -172,9 +172,9 @@ public class AIRobot { Class aiRobotClass = null; if (sub.hasKey("class")) { // Migration support for 6.4.x - aiRobotClass = AIRobotManager.getAIRobotByLegacyClassName(sub.getString("class")); + aiRobotClass = RobotManager.getAIRobotByLegacyClassName(sub.getString("class")); } else { - aiRobotClass = AIRobotManager.getAIRobotByName(sub.getString("aiName")); + aiRobotClass = RobotManager.getAIRobotByName(sub.getString("aiName")); } delegateAI = (AIRobot) aiRobotClass.getConstructor(EntityRobotBase.class) .newInstance(robot); @@ -196,9 +196,9 @@ public class AIRobot { Class aiRobotClass = null; if (nbt.hasKey("class")) { // Migration support for 6.4.x - aiRobotClass = AIRobotManager.getAIRobotByLegacyClassName(nbt.getString("class")); + aiRobotClass = RobotManager.getAIRobotByLegacyClassName(nbt.getString("class")); } else { - aiRobotClass = AIRobotManager.getAIRobotByName(nbt.getString("aiName")); + aiRobotClass = RobotManager.getAIRobotByName(nbt.getString("aiName")); } ai = (AIRobot) aiRobotClass.getConstructor(EntityRobotBase.class) .newInstance(robot); diff --git a/api/buildcraft/api/robots/AIRobotManager.java b/api/buildcraft/api/robots/AIRobotManager.java deleted file mode 100644 index 927313c8..00000000 --- a/api/buildcraft/api/robots/AIRobotManager.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.api.robots; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -public abstract class AIRobotManager { - - public static ArrayList> aiRobots = new ArrayList>(); - private static Map, String> aiRobotsNames = - new HashMap, String>(); - private static Map> aiRobotsByNames = - new HashMap>(); - private static Map> aiRobotsByLegacyClassNames = - new HashMap>(); - - public static void registerAIRobot(Class aiRobot, String name) { - registerAIRobot(aiRobot, name, null); - } - - public static void registerAIRobot(Class pluggable, String name, String legacyClassName) { - aiRobots.add(pluggable); - aiRobotsByNames.put(name, pluggable); - aiRobotsNames.put(pluggable, name); - if(legacyClassName != null) { - aiRobotsByLegacyClassNames.put(legacyClassName, pluggable); - } - } - - public static Class getAIRobotByName(String pluggableName) { - return aiRobotsByNames.get(pluggableName); - } - - public static String getAIRobotName(Class aClass) { - return aiRobotsNames.get(aClass); - } - - public static Class getAIRobotByLegacyClassName(String string) { - return aiRobotsByLegacyClassNames.get(string); - } -} diff --git a/api/buildcraft/api/robots/ResourceId.java b/api/buildcraft/api/robots/ResourceId.java index a3fbf87e..ed353e16 100755 --- a/api/buildcraft/api/robots/ResourceId.java +++ b/api/buildcraft/api/robots/ResourceId.java @@ -47,7 +47,7 @@ public abstract class ResourceId { nbt.setTag("index", indexNBT); nbt.setByte("side", (byte) side.ordinal()); nbt.setInteger("localId", localId); - nbt.setString("class", getClass().getCanonicalName()); + nbt.setString("resourceName", RobotManager.getResourceIdName(getClass())); } protected void readFromNBT(NBTTagCompound nbt) { @@ -58,9 +58,15 @@ public abstract class ResourceId { public static ResourceId load(NBTTagCompound nbt) { try { - Class clas = Class.forName(nbt.getString("class")); + Class cls = null; + if (nbt.hasKey("class")) { + // Migration support for 6.4.x + cls = RobotManager.getResourceIdByLegacyClassName(nbt.getString("class")); + } else { + cls = RobotManager.getResourceIdByName("resourceName"); + } - ResourceId id = (ResourceId) clas.newInstance(); + ResourceId id = (ResourceId) cls.newInstance(); id.readFromNBT(nbt); return id; diff --git a/api/buildcraft/api/robots/RobotManager.java b/api/buildcraft/api/robots/RobotManager.java new file mode 100644 index 00000000..011d0676 --- /dev/null +++ b/api/buildcraft/api/robots/RobotManager.java @@ -0,0 +1,80 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.api.robots; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +public abstract class RobotManager { + + public static ArrayList> aiRobots = new ArrayList>(); + private static Map, String> aiRobotsNames = + new HashMap, String>(); + private static Map> aiRobotsByNames = + new HashMap>(); + private static Map> aiRobotsByLegacyClassNames = + new HashMap>(); + + private static Map, String> resourceIdNames = + new HashMap, String>(); + private static Map> resourceIdByNames = + new HashMap>(); + private static Map> resourceIdLegacyClassNames = + new HashMap>(); + + public static void registerAIRobot(Class aiRobot, String name) { + registerAIRobot(aiRobot, name, null); + } + + public static void registerAIRobot(Class aiRobot, String name, String legacyClassName) { + aiRobots.add(aiRobot); + aiRobotsByNames.put(name, aiRobot); + aiRobotsNames.put(aiRobot, name); + if(legacyClassName != null) { + aiRobotsByLegacyClassNames.put(legacyClassName, aiRobot); + } + } + + public static Class getAIRobotByName(String aiRobotName) { + return aiRobotsByNames.get(aiRobotName); + } + + public static String getAIRobotName(Class aiRobotClass) { + return aiRobotsNames.get(aiRobotClass); + } + + public static Class getAIRobotByLegacyClassName(String aiRobotLegacyClassName) { + return aiRobotsByLegacyClassNames.get(aiRobotLegacyClassName); + } + + public static void registerResourceId(Class resourceId, String name) { + registerResourceId(resourceId, name, null); + } + + public static void registerResourceId(Class resourceId, String name, String legacyClassName) { + resourceIdByNames.put(name, resourceId); + resourceIdNames.put(resourceId, name); + if(legacyClassName != null) { + resourceIdLegacyClassNames.put(legacyClassName, resourceId); + } + } + + public static Class getResourceIdByName(String resourceIdName) { + return resourceIdByNames.get(resourceIdName); + } + + public static String getResourceIdName(Class resouceIdClass) { + return resourceIdNames.get(resouceIdClass); + } + + public static Class getResourceIdByLegacyClassName(String resourceIdLegacyClassName) { + return resourceIdLegacyClassNames.get(resourceIdLegacyClassName); + } +} diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index e4c21fd3..84636bd7 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -65,7 +65,7 @@ import buildcraft.api.core.IWorldProperty; import buildcraft.api.core.JavaTools; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.recipes.BuildcraftRecipeRegistry; -import buildcraft.api.robots.AIRobotManager; +import buildcraft.api.robots.RobotManager; import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatement; @@ -125,6 +125,9 @@ import buildcraft.core.utils.WorldPropertyIsWood; import buildcraft.energy.fuels.CoolantManager; import buildcraft.energy.fuels.FuelManager; import buildcraft.robots.EntityRobot; +import buildcraft.robots.ResourceIdAssemblyTable; +import buildcraft.robots.ResourceIdBlock; +import buildcraft.robots.ResourceIdRequest; import buildcraft.robots.ai.AIRobotAttack; import buildcraft.robots.ai.AIRobotBreak; import buildcraft.robots.ai.AIRobotCraftAssemblyTable; @@ -411,61 +414,64 @@ public class BuildCraftCore extends BuildCraftMod { StatementManager.registerTriggerProvider(new DefaultTriggerProvider()); StatementManager.registerActionProvider(new DefaultActionProvider()); - AIRobotManager.registerAIRobot(AIRobotMain.class, "aiRobotMain","buildcraft.core.robots.AIRobotMain"); - AIRobotManager.registerAIRobot(BoardRobotBomber.class, "boardRobotBomber", "buildcraft.core.robots.boards.BoardRobotBomber"); - AIRobotManager.registerAIRobot(BoardRobotBuilder.class, "boardRobotBuilder", "buildcraft.core.robots.boards.BoardRobotBuilder"); - AIRobotManager.registerAIRobot(BoardRobotButcher.class, "boardRobotButcher", "buildcraft.core.robots.boards.BoardRobotButcher"); - AIRobotManager.registerAIRobot(BoardRobotCarrier.class, "boardRobotCarrier", "buildcraft.core.robots.boards.BoardRobotCarrier"); - AIRobotManager.registerAIRobot(BoardRobotCrafter.class, "boardRobotCrafter", "buildcraft.core.robots.boards.BoardRobotCrafter"); - AIRobotManager.registerAIRobot(BoardRobotDelivery.class, "boardRobotDelivery", "buildcraft.core.robots.boards.BoardRobotDelivery"); - AIRobotManager.registerAIRobot(BoardRobotFarmer.class, "boardRobotFarmer", "buildcraft.core.robots.boards.BoardRobotFarmer"); - AIRobotManager.registerAIRobot(BoardRobotFluidCarrier.class, "boardRobotFluidCarrier", "buildcraft.core.robots.boards.BoardRobotFluidCarrier"); - AIRobotManager.registerAIRobot(BoardRobotHarvester.class, "boardRobotHarvester", "buildcraft.core.robots.boards.BoardRobotHarvester"); - AIRobotManager.registerAIRobot(BoardRobotKnight.class, "boardRobotKnight", "buildcraft.core.robots.boards.BoardRobotKnight"); - AIRobotManager.registerAIRobot(BoardRobotLeaveCutter.class, "boardRobotLeaveCutter", "buildcraft.core.robots.boards.BoardRobotLeaveCutter"); - AIRobotManager.registerAIRobot(BoardRobotLumberjack.class, "boardRobotLumberjack", "buildcraft.core.robots.boards.BoardRobotLumberjack"); - AIRobotManager.registerAIRobot(BoardRobotMiner.class, "boardRobotMiner", "buildcraft.core.robots.boards.BoardRobotMiner"); - AIRobotManager.registerAIRobot(BoardRobotPicker.class, "boardRobotPicker", "buildcraft.core.robots.boards.BoardRobotPicker"); - AIRobotManager.registerAIRobot(BoardRobotPlanter.class, "boardRobotPlanter", "buildcraft.core.robots.boards.BoardRobotPlanter"); - AIRobotManager.registerAIRobot(BoardRobotPump.class, "boardRobotPump", "buildcraft.core.robots.boards.BoardRobotPump"); - AIRobotManager.registerAIRobot(BoardRobotShovelman.class, "boardRobotShovelman", "buildcraft.core.robots.boards.BoardRobotShovelman"); - AIRobotManager.registerAIRobot(AIRobotAttack.class, "aiRobotAttack", "buildcraft.core.robots.AIRobotAttack"); - AIRobotManager.registerAIRobot(AIRobotBreak.class, "aiRobotBreak", "buildcraft.core.robots.AIRobotBreak"); - AIRobotManager.registerAIRobot(AIRobotCraftAssemblyTable.class, "aiRobotCraftAssemblyTable", "buildcraft.core.robots.AIRobotCraftAssemblyTable"); - AIRobotManager.registerAIRobot(AIRobotCraftFurnace.class, "aiRobotCraftFurnace", "buildcraft.core.robots.AIRobotCraftFurnace"); - AIRobotManager.registerAIRobot(AIRobotCraftWorkbench.class, "aiRobotCraftWorkbench", "buildcraft.core.robots.AIRobotCraftWorkbench"); - AIRobotManager.registerAIRobot(AIRobotDeliverRequested.class, "aiRobotDeliverRequested", "buildcraft.core.robots.AIRobotDeliverRequested"); - AIRobotManager.registerAIRobot(AIRobotDisposeItems.class, "aiRobotDisposeItems", "buildcraft.core.robots.AIRobotDisposeItems"); - AIRobotManager.registerAIRobot(AIRobotFetchAndEquipItemStack.class, "aiRobotFetchAndEquipItemStack", "buildcraft.core.robots.AIRobotFetchAndEquipItemStack"); - AIRobotManager.registerAIRobot(AIRobotFetchItem.class, "aiRobotFetchItem", "buildcraft.core.robots.AIRobotFetchItem"); - AIRobotManager.registerAIRobot(AIRobotGoAndLinkToDock.class, "aiRobotGoAndLinkToDock", "buildcraft.core.robots.AIRobotGoAndLinkToDock"); - AIRobotManager.registerAIRobot(AIRobotGoto.class, "aiRobotGoto", "buildcraft.core.robots.AIRobotGoto"); - AIRobotManager.registerAIRobot(AIRobotGotoBlock.class, "aiRobotGotoBlock", "buildcraft.core.robots.AIRobotGotoBlock"); - AIRobotManager.registerAIRobot(AIRobotGotoRandomGroundBlock.class, "aiRobotGotoRandomGroundBlock", "buildcraft.core.robots.AIRobotGotoRandomGroundBlock"); - AIRobotManager.registerAIRobot(AIRobotGotoSleep.class, "aiRobotGotoSleep", "buildcraft.core.robots.AIRobotGotoSleep"); - AIRobotManager.registerAIRobot(AIRobotGotoStation.class, "aiRobotGotoStation", "buildcraft.core.robots.AIRobotGotoStation"); - AIRobotManager.registerAIRobot(AIRobotGotoStationAndLoad.class, "aiRobotGotoStationAndLoad", "buildcraft.core.robots.AIRobotGotoStationAndLoad"); - AIRobotManager.registerAIRobot(AIRobotGotoStationAndLoadFluids.class, "aiRobotGotoStationAndLoadFluids", "buildcraft.core.robots.AIRobotGotoStationAndLoadFluids"); - AIRobotManager.registerAIRobot(AIRobotGotoStationAndUnload.class, "aiRobotGotoStationAndUnload", "buildcraft.core.robots.AIRobotGotoStationAndUnload"); - AIRobotManager.registerAIRobot(AIRobotGotoStationToLoad.class, "aiRobotGotoStationToLoad", "buildcraft.core.robots.AIRobotGotoStationToLoad"); - AIRobotManager.registerAIRobot(AIRobotGotoStationToLoadFluids.class, "aiRobotGotoStationToLoadFluids", "buildcraft.core.robots.AIRobotGotoStationToLoadFluids"); - AIRobotManager.registerAIRobot(AIRobotGotoStationToUnload.class, "aiRobotGotoStationToUnload", "buildcraft.core.robots.AIRobotGotoStationToUnload"); - AIRobotManager.registerAIRobot(AIRobotGotoStationToUnloadFluids.class, "aiRobotGotoStationToUnloadFluids", "buildcraft.core.robots.AIRobotGotoStationToUnloadFluids"); - AIRobotManager.registerAIRobot(AIRobotLoad.class, "aiRobotLoad", "buildcraft.core.robots.AIRobotLoad"); - AIRobotManager.registerAIRobot(AIRobotLoadFluids.class, "aiRobotLoadFluids", "buildcraft.core.robots.AIRobotLoadFluids"); - AIRobotManager.registerAIRobot(AIRobotPumpBlock.class, "aiRobotPumpBlock", "buildcraft.core.robots.AIRobotPumpBlock"); - AIRobotManager.registerAIRobot(AIRobotRecharge.class, "aiRobotRecharge", "buildcraft.core.robots.AIRobotRecharge"); - AIRobotManager.registerAIRobot(AIRobotSearchAndGotoStation.class, "aiRobotSearchAndGotoStation", "buildcraft.core.robots.AIRobotSearchAndGotoStation"); - AIRobotManager.registerAIRobot(AIRobotSearchBlock.class, "aiRobotSearchBlock", "buildcraft.core.robots.AIRobotSearchBlock"); - AIRobotManager.registerAIRobot(AIRobotSearchEntity.class, "aiRobotSearchEntity", "buildcraft.core.robots.AIRobotSearchEntity"); - AIRobotManager.registerAIRobot(AIRobotSearchRandomGroundBlock.class, "aiRobotSearchRandomGroundBlock", "buildcraft.core.robots.AIRobotSearchRandomGroundBlock"); - AIRobotManager.registerAIRobot(AIRobotSearchStackRequest.class, "aiRobotSearchStackRequest", "buildcraft.core.robots.AIRobotSearchStackRequest"); - AIRobotManager.registerAIRobot(AIRobotSearchStation.class, "aiRobotSearchStation", "buildcraft.core.robots.AIRobotSearchStation"); - AIRobotManager.registerAIRobot(AIRobotSleep.class, "aiRobotSleep", "buildcraft.core.robots.AIRobotSleep"); - AIRobotManager.registerAIRobot(AIRobotStraightMoveTo.class, "aiRobotStraightMoveTo", "buildcraft.core.robots.AIRobotStraightMoveTo"); - AIRobotManager.registerAIRobot(AIRobotUnload.class, "aiRobotUnload", "buildcraft.core.robots.AIRobotUnload"); - AIRobotManager.registerAIRobot(AIRobotUnloadFluids.class, "aiRobotUnloadFluids", "buildcraft.core.robots.AIRobotUnloadFluids"); - AIRobotManager.registerAIRobot(AIRobotUseToolOnBlock.class, "aiRobotUseToolOnBlock", "buildcraft.core.robots.AIRobotUseToolOnBlock"); + RobotManager.registerAIRobot(AIRobotMain.class, "aiRobotMain", "buildcraft.core.robots.AIRobotMain"); + RobotManager.registerAIRobot(BoardRobotBomber.class, "boardRobotBomber", "buildcraft.core.robots.boards.BoardRobotBomber"); + RobotManager.registerAIRobot(BoardRobotBuilder.class, "boardRobotBuilder", "buildcraft.core.robots.boards.BoardRobotBuilder"); + RobotManager.registerAIRobot(BoardRobotButcher.class, "boardRobotButcher", "buildcraft.core.robots.boards.BoardRobotButcher"); + RobotManager.registerAIRobot(BoardRobotCarrier.class, "boardRobotCarrier", "buildcraft.core.robots.boards.BoardRobotCarrier"); + RobotManager.registerAIRobot(BoardRobotCrafter.class, "boardRobotCrafter", "buildcraft.core.robots.boards.BoardRobotCrafter"); + RobotManager.registerAIRobot(BoardRobotDelivery.class, "boardRobotDelivery", "buildcraft.core.robots.boards.BoardRobotDelivery"); + RobotManager.registerAIRobot(BoardRobotFarmer.class, "boardRobotFarmer", "buildcraft.core.robots.boards.BoardRobotFarmer"); + RobotManager.registerAIRobot(BoardRobotFluidCarrier.class, "boardRobotFluidCarrier", "buildcraft.core.robots.boards.BoardRobotFluidCarrier"); + RobotManager.registerAIRobot(BoardRobotHarvester.class, "boardRobotHarvester", "buildcraft.core.robots.boards.BoardRobotHarvester"); + RobotManager.registerAIRobot(BoardRobotKnight.class, "boardRobotKnight", "buildcraft.core.robots.boards.BoardRobotKnight"); + RobotManager.registerAIRobot(BoardRobotLeaveCutter.class, "boardRobotLeaveCutter", "buildcraft.core.robots.boards.BoardRobotLeaveCutter"); + RobotManager.registerAIRobot(BoardRobotLumberjack.class, "boardRobotLumberjack", "buildcraft.core.robots.boards.BoardRobotLumberjack"); + RobotManager.registerAIRobot(BoardRobotMiner.class, "boardRobotMiner", "buildcraft.core.robots.boards.BoardRobotMiner"); + RobotManager.registerAIRobot(BoardRobotPicker.class, "boardRobotPicker", "buildcraft.core.robots.boards.BoardRobotPicker"); + RobotManager.registerAIRobot(BoardRobotPlanter.class, "boardRobotPlanter", "buildcraft.core.robots.boards.BoardRobotPlanter"); + RobotManager.registerAIRobot(BoardRobotPump.class, "boardRobotPump", "buildcraft.core.robots.boards.BoardRobotPump"); + RobotManager.registerAIRobot(BoardRobotShovelman.class, "boardRobotShovelman", "buildcraft.core.robots.boards.BoardRobotShovelman"); + RobotManager.registerAIRobot(AIRobotAttack.class, "aiRobotAttack", "buildcraft.core.robots.AIRobotAttack"); + RobotManager.registerAIRobot(AIRobotBreak.class, "aiRobotBreak", "buildcraft.core.robots.AIRobotBreak"); + RobotManager.registerAIRobot(AIRobotCraftAssemblyTable.class, "aiRobotCraftAssemblyTable", "buildcraft.core.robots.AIRobotCraftAssemblyTable"); + RobotManager.registerAIRobot(AIRobotCraftFurnace.class, "aiRobotCraftFurnace", "buildcraft.core.robots.AIRobotCraftFurnace"); + RobotManager.registerAIRobot(AIRobotCraftWorkbench.class, "aiRobotCraftWorkbench", "buildcraft.core.robots.AIRobotCraftWorkbench"); + RobotManager.registerAIRobot(AIRobotDeliverRequested.class, "aiRobotDeliverRequested", "buildcraft.core.robots.AIRobotDeliverRequested"); + RobotManager.registerAIRobot(AIRobotDisposeItems.class, "aiRobotDisposeItems", "buildcraft.core.robots.AIRobotDisposeItems"); + RobotManager.registerAIRobot(AIRobotFetchAndEquipItemStack.class, "aiRobotFetchAndEquipItemStack", "buildcraft.core.robots.AIRobotFetchAndEquipItemStack"); + RobotManager.registerAIRobot(AIRobotFetchItem.class, "aiRobotFetchItem", "buildcraft.core.robots.AIRobotFetchItem"); + RobotManager.registerAIRobot(AIRobotGoAndLinkToDock.class, "aiRobotGoAndLinkToDock", "buildcraft.core.robots.AIRobotGoAndLinkToDock"); + RobotManager.registerAIRobot(AIRobotGoto.class, "aiRobotGoto", "buildcraft.core.robots.AIRobotGoto"); + RobotManager.registerAIRobot(AIRobotGotoBlock.class, "aiRobotGotoBlock", "buildcraft.core.robots.AIRobotGotoBlock"); + RobotManager.registerAIRobot(AIRobotGotoRandomGroundBlock.class, "aiRobotGotoRandomGroundBlock", "buildcraft.core.robots.AIRobotGotoRandomGroundBlock"); + RobotManager.registerAIRobot(AIRobotGotoSleep.class, "aiRobotGotoSleep", "buildcraft.core.robots.AIRobotGotoSleep"); + RobotManager.registerAIRobot(AIRobotGotoStation.class, "aiRobotGotoStation", "buildcraft.core.robots.AIRobotGotoStation"); + RobotManager.registerAIRobot(AIRobotGotoStationAndLoad.class, "aiRobotGotoStationAndLoad", "buildcraft.core.robots.AIRobotGotoStationAndLoad"); + RobotManager.registerAIRobot(AIRobotGotoStationAndLoadFluids.class, "aiRobotGotoStationAndLoadFluids", "buildcraft.core.robots.AIRobotGotoStationAndLoadFluids"); + RobotManager.registerAIRobot(AIRobotGotoStationAndUnload.class, "aiRobotGotoStationAndUnload", "buildcraft.core.robots.AIRobotGotoStationAndUnload"); + RobotManager.registerAIRobot(AIRobotGotoStationToLoad.class, "aiRobotGotoStationToLoad", "buildcraft.core.robots.AIRobotGotoStationToLoad"); + RobotManager.registerAIRobot(AIRobotGotoStationToLoadFluids.class, "aiRobotGotoStationToLoadFluids", "buildcraft.core.robots.AIRobotGotoStationToLoadFluids"); + RobotManager.registerAIRobot(AIRobotGotoStationToUnload.class, "aiRobotGotoStationToUnload", "buildcraft.core.robots.AIRobotGotoStationToUnload"); + RobotManager.registerAIRobot(AIRobotGotoStationToUnloadFluids.class, "aiRobotGotoStationToUnloadFluids", "buildcraft.core.robots.AIRobotGotoStationToUnloadFluids"); + RobotManager.registerAIRobot(AIRobotLoad.class, "aiRobotLoad", "buildcraft.core.robots.AIRobotLoad"); + RobotManager.registerAIRobot(AIRobotLoadFluids.class, "aiRobotLoadFluids", "buildcraft.core.robots.AIRobotLoadFluids"); + RobotManager.registerAIRobot(AIRobotPumpBlock.class, "aiRobotPumpBlock", "buildcraft.core.robots.AIRobotPumpBlock"); + RobotManager.registerAIRobot(AIRobotRecharge.class, "aiRobotRecharge", "buildcraft.core.robots.AIRobotRecharge"); + RobotManager.registerAIRobot(AIRobotSearchAndGotoStation.class, "aiRobotSearchAndGotoStation", "buildcraft.core.robots.AIRobotSearchAndGotoStation"); + RobotManager.registerAIRobot(AIRobotSearchBlock.class, "aiRobotSearchBlock", "buildcraft.core.robots.AIRobotSearchBlock"); + RobotManager.registerAIRobot(AIRobotSearchEntity.class, "aiRobotSearchEntity", "buildcraft.core.robots.AIRobotSearchEntity"); + RobotManager.registerAIRobot(AIRobotSearchRandomGroundBlock.class, "aiRobotSearchRandomGroundBlock", "buildcraft.core.robots.AIRobotSearchRandomGroundBlock"); + RobotManager.registerAIRobot(AIRobotSearchStackRequest.class, "aiRobotSearchStackRequest", "buildcraft.core.robots.AIRobotSearchStackRequest"); + RobotManager.registerAIRobot(AIRobotSearchStation.class, "aiRobotSearchStation", "buildcraft.core.robots.AIRobotSearchStation"); + RobotManager.registerAIRobot(AIRobotSleep.class, "aiRobotSleep", "buildcraft.core.robots.AIRobotSleep"); + RobotManager.registerAIRobot(AIRobotStraightMoveTo.class, "aiRobotStraightMoveTo", "buildcraft.core.robots.AIRobotStraightMoveTo"); + RobotManager.registerAIRobot(AIRobotUnload.class, "aiRobotUnload", "buildcraft.core.robots.AIRobotUnload"); + RobotManager.registerAIRobot(AIRobotUnloadFluids.class, "aiRobotUnloadFluids", "buildcraft.core.robots.AIRobotUnloadFluids"); + RobotManager.registerAIRobot(AIRobotUseToolOnBlock.class, "aiRobotUseToolOnBlock", "buildcraft.core.robots.AIRobotUseToolOnBlock"); + RobotManager.registerResourceId(ResourceIdAssemblyTable.class, "resourceIdAssemblyTable", "buildcraft.core.robots.ResourceIdAssemblyTable"); + RobotManager.registerResourceId(ResourceIdBlock.class, "resourceIdBlock", "buildcraft.core.robots.ResourceIdBlock"); + RobotManager.registerResourceId(ResourceIdRequest.class, "resourceIdRequest", "buildcraft.core.robots.ResourceIdRequest"); if (BuildCraftCore.modifyWorld) { MinecraftForge.EVENT_BUS.register(new SpringPopulate()); From 2afa5ceea46cdcc5d6de0723d665a8b9d53ad12e Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Wed, 4 Feb 2015 00:03:17 -0300 Subject: [PATCH 16/67] fix style --- api/buildcraft/api/filler/IFillerPattern.java | 4 --- api/buildcraft/api/robots/RobotManager.java | 4 +-- .../transport/pluggable/IFacadePluggable.java | 11 +++--- common/buildcraft/BuildCraftSilicon.java | 34 +++++++++---------- common/buildcraft/BuildCraftTransport.java | 9 ++--- common/buildcraft/builders/TileBuilder.java | 2 +- common/buildcraft/builders/gui/GuiFiller.java | 4 --- .../buildcraft/commander/TileRequester.java | 2 +- common/buildcraft/core/InterModComms.java | 6 ++-- .../core/gui/StatementParameterSlot.java | 2 -- common/buildcraft/core/gui/StatementSlot.java | 2 -- .../core/proxy/CoreProxyClient.java | 2 +- .../utils/concurrency/IIterableAlgorithm.java | 4 +-- common/buildcraft/robots/ItemRobot.java | 1 - .../robots/RobotIntegrationRecipe.java | 1 - common/buildcraft/robots/RobotUtils.java | 3 +- .../robots/ai/AIRobotCraftAssemblyTable.java | 4 +-- .../robots/boards/BoardRobotBomber.java | 2 +- .../robots/boards/BoardRobotButcher.java | 2 +- .../robots/boards/BoardRobotFarmer.java | 2 +- .../boards/BoardRobotGenericBreakBlock.java | 4 +-- .../robots/boards/BoardRobotKnight.java | 2 +- .../robots/boards/BoardRobotPickerNBT.java | 2 +- .../buildcraft/robots/render/RenderRobot.java | 2 +- .../robots/statements/ActionRobotFilter.java | 2 +- .../statements/ActionRobotGotoStation.java | 10 +++--- .../ActionStationAcceptItemsInv.java | 2 +- .../ActionStationAcceptItemsPipe.java | 2 +- .../statements/ActionStationForbidRobot.java | 4 +-- .../statements/ActionStationInputItems.java | 2 +- .../statements/ActionStationRequestItems.java | 2 +- .../statements/RobotsActionProvider.java | 1 - .../statements/RobotsTriggerProvider.java | 2 -- .../robots/statements/TriggerRobotSleep.java | 11 +++--- .../buildcraft/silicon/TileAssemblyTable.java | 4 +-- .../transport/BlockGenericPipe.java | 8 ++--- common/buildcraft/transport/ItemFacade.java | 3 +- .../transport/render/FacadeBlockAccess.java | 1 - .../transport/render/FacadeRenderHelper.java | 1 - 39 files changed, 73 insertions(+), 93 deletions(-) diff --git a/api/buildcraft/api/filler/IFillerPattern.java b/api/buildcraft/api/filler/IFillerPattern.java index da463747..c18e5c2a 100644 --- a/api/buildcraft/api/filler/IFillerPattern.java +++ b/api/buildcraft/api/filler/IFillerPattern.java @@ -8,10 +8,6 @@ */ package buildcraft.api.filler; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.statements.IStatement; public interface IFillerPattern extends IStatement { diff --git a/api/buildcraft/api/robots/RobotManager.java b/api/buildcraft/api/robots/RobotManager.java index 011d0676..0191b80d 100644 --- a/api/buildcraft/api/robots/RobotManager.java +++ b/api/buildcraft/api/robots/RobotManager.java @@ -37,7 +37,7 @@ public abstract class RobotManager { aiRobots.add(aiRobot); aiRobotsByNames.put(name, aiRobot); aiRobotsNames.put(aiRobot, name); - if(legacyClassName != null) { + if (legacyClassName != null) { aiRobotsByLegacyClassNames.put(legacyClassName, aiRobot); } } @@ -61,7 +61,7 @@ public abstract class RobotManager { public static void registerResourceId(Class resourceId, String name, String legacyClassName) { resourceIdByNames.put(name, resourceId); resourceIdNames.put(resourceId, name); - if(legacyClassName != null) { + if (legacyClassName != null) { resourceIdLegacyClassNames.put(legacyClassName, resourceId); } } diff --git a/api/buildcraft/api/transport/pluggable/IFacadePluggable.java b/api/buildcraft/api/transport/pluggable/IFacadePluggable.java index 08ae33f7..6289714a 100644 --- a/api/buildcraft/api/transport/pluggable/IFacadePluggable.java +++ b/api/buildcraft/api/transport/pluggable/IFacadePluggable.java @@ -3,8 +3,11 @@ package buildcraft.api.transport.pluggable; import net.minecraft.block.Block; public interface IFacadePluggable { - public Block getCurrentBlock(); - public int getCurrentMetadata(); - public boolean isTransparent(); - public boolean isHollow(); + Block getCurrentBlock(); + + int getCurrentMetadata(); + + boolean isTransparent(); + + boolean isHollow(); } diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index abc1ecae..cea3d6a9 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -42,10 +42,10 @@ import buildcraft.compat.CompatHooks; import buildcraft.core.DefaultProps; import buildcraft.core.InterModComms; import buildcraft.core.ItemBuildCraft; -import buildcraft.robots.ItemRobot; import buildcraft.core.Version; import buildcraft.core.network.BuildCraftChannelHandler; import buildcraft.core.proxy.CoreProxy; +import buildcraft.robots.ItemRobot; import buildcraft.robots.RobotIntegrationRecipe; import buildcraft.robots.boards.BoardRobotBomberNBT; import buildcraft.robots.boards.BoardRobotBuilderNBT; @@ -64,22 +64,6 @@ 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; -import buildcraft.silicon.ItemLaserTable; -import buildcraft.silicon.ItemRedstoneBoard; -import buildcraft.silicon.ItemRedstoneChipset; -import buildcraft.silicon.ItemRedstoneChipset.Chipset; -import buildcraft.silicon.SiliconProxy; -import buildcraft.silicon.TileAdvancedCraftingTable; -import buildcraft.silicon.TileAssemblyTable; -import buildcraft.silicon.TileChargingTable; -import buildcraft.silicon.TileIntegrationTable; -import buildcraft.silicon.TileLaser; -import buildcraft.silicon.boards.BoardRecipe; -import buildcraft.silicon.boards.ImplRedstoneBoardRegistry; -import buildcraft.silicon.network.PacketHandlerSilicon; import buildcraft.robots.statements.ActionRobotFilter; import buildcraft.robots.statements.ActionRobotGotoStation; import buildcraft.robots.statements.ActionRobotWakeUp; @@ -96,6 +80,22 @@ import buildcraft.robots.statements.ActionStationRequestItemsMachine; import buildcraft.robots.statements.RobotsActionProvider; import buildcraft.robots.statements.RobotsTriggerProvider; import buildcraft.robots.statements.TriggerRobotSleep; +import buildcraft.silicon.BlockLaser; +import buildcraft.silicon.BlockLaserTable; +import buildcraft.silicon.GuiHandler; +import buildcraft.silicon.ItemLaserTable; +import buildcraft.silicon.ItemRedstoneBoard; +import buildcraft.silicon.ItemRedstoneChipset; +import buildcraft.silicon.ItemRedstoneChipset.Chipset; +import buildcraft.silicon.SiliconProxy; +import buildcraft.silicon.TileAdvancedCraftingTable; +import buildcraft.silicon.TileAssemblyTable; +import buildcraft.silicon.TileChargingTable; +import buildcraft.silicon.TileIntegrationTable; +import buildcraft.silicon.TileLaser; +import buildcraft.silicon.boards.BoardRecipe; +import buildcraft.silicon.boards.ImplRedstoneBoardRegistry; +import buildcraft.silicon.network.PacketHandlerSilicon; @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 374ad4c5..eafd99c9 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -56,6 +56,8 @@ import buildcraft.core.Version; import buildcraft.core.network.BuildCraftChannelHandler; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.ColorUtils; +import buildcraft.robots.ItemRobotStation; +import buildcraft.robots.RobotStationPluggable; import buildcraft.silicon.ItemRedstoneChipset.Chipset; import buildcraft.transport.BlockFilteredBuffer; import buildcraft.transport.BlockGenericPipe; @@ -120,10 +122,8 @@ import buildcraft.transport.pipes.PipePowerWood; import buildcraft.transport.pipes.PipeStructureCobblestone; import buildcraft.transport.pluggable.ItemLens; import buildcraft.transport.pluggable.ItemPlug; -import buildcraft.robots.ItemRobotStation; import buildcraft.transport.pluggable.LensPluggable; import buildcraft.transport.pluggable.PlugPluggable; -import buildcraft.robots.RobotStationPluggable; import buildcraft.transport.recipes.AdvancedFacadeRecipe; import buildcraft.transport.recipes.GateExpansionRecipe; import buildcraft.transport.recipes.GateLogicSwapRecipe; @@ -500,8 +500,9 @@ public class BuildCraftTransport extends BuildCraftMod { public void loadRecipes() { // Add base recipe for pipe waterproof. GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.dye, 1, 2)); - if(additionalWaterproofingRecipe) - GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.slime_ball, 1, 2)); + if (additionalWaterproofingRecipe) { + GameRegistry.addShapelessRecipe(new ItemStack(pipeWaterproof, 1), new ItemStack(Items.slime_ball, 1, 2)); + } // Add pipe recipes for (PipeRecipe pipe : pipeRecipes) { diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index 7afe5183..c6533f9b 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -64,9 +64,9 @@ import buildcraft.core.inventory.Transactor; import buildcraft.core.network.BuildCraftPacket; import buildcraft.core.network.CommandWriter; import buildcraft.core.network.PacketCommand; +import buildcraft.core.utils.Utils; 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/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index 99629a16..7b6f660a 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -9,9 +9,7 @@ package buildcraft.builders.gui; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.inventory.IInventory; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import buildcraft.api.filler.FillerManager; @@ -23,14 +21,12 @@ import buildcraft.core.DefaultProps; import buildcraft.core.builders.patterns.FillerPattern; import buildcraft.core.gui.AdvancedSlot; import buildcraft.core.gui.GuiAdvancedInterface; -import buildcraft.core.gui.GuiBuildCraft; import buildcraft.core.gui.GuiTools; import buildcraft.core.gui.StatementParameterSlot; import buildcraft.core.gui.StatementSlot; import buildcraft.core.gui.buttons.GuiBetterButton; import buildcraft.core.gui.buttons.StandardButtonTextureSets; import buildcraft.core.utils.StringUtils; -import buildcraft.transport.Pipe; public class GuiFiller extends GuiAdvancedInterface { class FillerParameterSlot extends StatementParameterSlot { diff --git a/common/buildcraft/commander/TileRequester.java b/common/buildcraft/commander/TileRequester.java index 5d1c0384..72021e8d 100755 --- a/common/buildcraft/commander/TileRequester.java +++ b/common/buildcraft/commander/TileRequester.java @@ -27,9 +27,9 @@ import buildcraft.core.inventory.StackHelper; import buildcraft.core.network.CommandWriter; import buildcraft.core.network.ICommandReceiver; import buildcraft.core.network.PacketCommand; +import buildcraft.core.utils.Utils; import buildcraft.robots.ResourceIdRequest; import buildcraft.robots.RobotRegistry; -import buildcraft.core.utils.Utils; public class TileRequester extends TileBuildCraft implements IInventory, IRequestProvider, ICommandReceiver { public static final int NB_ITEMS = 20; diff --git a/common/buildcraft/core/InterModComms.java b/common/buildcraft/core/InterModComms.java index b7bc10f7..637f6d27 100644 --- a/common/buildcraft/core/InterModComms.java +++ b/common/buildcraft/core/InterModComms.java @@ -11,8 +11,6 @@ package buildcraft.core; import java.util.ArrayList; import java.util.List; -import buildcraft.api.fuels.ICoolant; -import buildcraft.energy.fuels.CoolantManager; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Iterables; @@ -33,11 +31,13 @@ import net.minecraftforge.fluids.FluidStack; import buildcraft.BuildCraftTransport; import buildcraft.api.core.BCLog; +import buildcraft.api.fuels.ICoolant; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.recipes.IntegrationRecipeManager; import buildcraft.core.recipes.RefineryRecipeManager; +import buildcraft.energy.fuels.CoolantManager; import buildcraft.energy.worldgen.OilPopulate; import buildcraft.transport.ItemFacade; import buildcraft.transport.recipes.GateExpansionRecipe; @@ -258,7 +258,7 @@ public final class InterModComms { public static void processCoolantAddIMC(IMCEvent event, IMCMessage m) { boolean failed = false; - if (!m.isNBTMessage()){ + if (!m.isNBTMessage()) { failed = true; } else { NBTTagCompound tag = m.getNBTValue(); diff --git a/common/buildcraft/core/gui/StatementParameterSlot.java b/common/buildcraft/core/gui/StatementParameterSlot.java index 00bd1830..719c3584 100644 --- a/common/buildcraft/core/gui/StatementParameterSlot.java +++ b/common/buildcraft/core/gui/StatementParameterSlot.java @@ -3,8 +3,6 @@ package buildcraft.core.gui; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import buildcraft.api.statements.IStatementParameter; -import buildcraft.transport.Pipe; -import buildcraft.transport.gui.GuiGateInterface; /** * Created by asie on 1/24/15. diff --git a/common/buildcraft/core/gui/StatementSlot.java b/common/buildcraft/core/gui/StatementSlot.java index 0e9ef022..37616ade 100644 --- a/common/buildcraft/core/gui/StatementSlot.java +++ b/common/buildcraft/core/gui/StatementSlot.java @@ -5,8 +5,6 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.statements.IStatement; -import buildcraft.transport.Pipe; -import buildcraft.transport.gui.GuiGateInterface; /** * Created by asie on 1/24/15. diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 32884cd4..606bc954 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.robots.render.RenderRobot; import buildcraft.core.render.RenderingEntityBlocks; import buildcraft.core.render.RenderingMarkers; import buildcraft.robots.EntityRobot; +import buildcraft.robots.render.RenderRobot; import buildcraft.transport.render.TileEntityPickupFX; public class CoreProxyClient extends CoreProxy { diff --git a/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java b/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java index 4bfe6427..82b0272e 100644 --- a/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java +++ b/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java @@ -10,8 +10,8 @@ package buildcraft.core.utils.concurrency; public interface IIterableAlgorithm { - abstract void iterate(); + void iterate(); - abstract boolean isDone(); + boolean isDone(); } \ No newline at end of file diff --git a/common/buildcraft/robots/ItemRobot.java b/common/buildcraft/robots/ItemRobot.java index acd6fcb0..5b9fd035 100755 --- a/common/buildcraft/robots/ItemRobot.java +++ b/common/buildcraft/robots/ItemRobot.java @@ -30,7 +30,6 @@ import buildcraft.api.boards.RedstoneBoardRobotNBT; 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 implements IEnergyContainerItem { diff --git a/common/buildcraft/robots/RobotIntegrationRecipe.java b/common/buildcraft/robots/RobotIntegrationRecipe.java index 821617ff..147229fa 100755 --- a/common/buildcraft/robots/RobotIntegrationRecipe.java +++ b/common/buildcraft/robots/RobotIntegrationRecipe.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import buildcraft.BuildCraftSilicon; import buildcraft.api.recipes.CraftingResult; -import buildcraft.robots.ItemRobot; import buildcraft.silicon.ItemRedstoneBoard; import buildcraft.silicon.TileIntegrationTable; import buildcraft.transport.recipes.IntegrationTableRecipe; diff --git a/common/buildcraft/robots/RobotUtils.java b/common/buildcraft/robots/RobotUtils.java index 1acdd83c..5631d944 100644 --- a/common/buildcraft/robots/RobotUtils.java +++ b/common/buildcraft/robots/RobotUtils.java @@ -2,12 +2,11 @@ package buildcraft.robots; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.IPipeTile; -import buildcraft.transport.TileGenericPipe; /** * Created by asie on 1/24/15. */ -public class RobotUtils { +public final class RobotUtils { private RobotUtils() { } diff --git a/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java b/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java index 56c8745c..81d954dd 100755 --- a/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java +++ b/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java @@ -34,10 +34,10 @@ 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.robots.statements.ActionRobotFilter; import buildcraft.robots.statements.ActionStationAllowCraft; +import buildcraft.silicon.BlockLaserTable; +import buildcraft.silicon.TileAssemblyTable; public class AIRobotCraftAssemblyTable extends AIRobotCraftGeneric { diff --git a/common/buildcraft/robots/boards/BoardRobotBomber.java b/common/buildcraft/robots/boards/BoardRobotBomber.java index 436d4571..edfb1bdd 100755 --- a/common/buildcraft/robots/boards/BoardRobotBomber.java +++ b/common/buildcraft/robots/boards/BoardRobotBomber.java @@ -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.utils.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/robots/boards/BoardRobotButcher.java b/common/buildcraft/robots/boards/BoardRobotButcher.java index 61baec29..39f1fbc0 100755 --- a/common/buildcraft/robots/boards/BoardRobotButcher.java +++ b/common/buildcraft/robots/boards/BoardRobotButcher.java @@ -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.utils.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/robots/boards/BoardRobotFarmer.java b/common/buildcraft/robots/boards/BoardRobotFarmer.java index 1afbbb56..63c0480b 100644 --- a/common/buildcraft/robots/boards/BoardRobotFarmer.java +++ b/common/buildcraft/robots/boards/BoardRobotFarmer.java @@ -22,12 +22,12 @@ import buildcraft.api.robots.EntityRobotBase; import buildcraft.core.inventory.filters.IStackFilter; import buildcraft.core.utils.IBlockFilter; import buildcraft.robots.ResourceIdBlock; +import buildcraft.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.robots.RobotRegistry; public class BoardRobotFarmer extends RedstoneBoardRobot { diff --git a/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java index 6228c6c5..55fc50f7 100644 --- a/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java +++ b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java @@ -24,13 +24,13 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.filters.IStackFilter; import buildcraft.core.utils.IBlockFilter; +import buildcraft.robots.DockingStation; +import buildcraft.robots.ResourceIdBlock; 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.robots.ResourceIdBlock; import buildcraft.robots.statements.ActionRobotFilter; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robots/boards/BoardRobotKnight.java b/common/buildcraft/robots/boards/BoardRobotKnight.java index bdb07bc7..fad0f148 100755 --- a/common/buildcraft/robots/boards/BoardRobotKnight.java +++ b/common/buildcraft/robots/boards/BoardRobotKnight.java @@ -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.utils.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/robots/boards/BoardRobotPickerNBT.java b/common/buildcraft/robots/boards/BoardRobotPickerNBT.java index 39684395..6703c6de 100755 --- a/common/buildcraft/robots/boards/BoardRobotPickerNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotPickerNBT.java @@ -20,8 +20,8 @@ import net.minecraft.util.ResourceLocation; import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.boards.RedstoneBoardRobotNBT; import buildcraft.api.robots.EntityRobotBase; -import buildcraft.robots.EntityRobot; import buildcraft.core.utils.StringUtils; +import buildcraft.robots.EntityRobot; public final class BoardRobotPickerNBT extends RedstoneBoardRobotNBT { diff --git a/common/buildcraft/robots/render/RenderRobot.java b/common/buildcraft/robots/render/RenderRobot.java index 2124a2aa..ef5a42f4 100644 --- a/common/buildcraft/robots/render/RenderRobot.java +++ b/common/buildcraft/robots/render/RenderRobot.java @@ -31,8 +31,8 @@ import buildcraft.core.DefaultProps; import buildcraft.core.EntityLaser; import buildcraft.core.render.RenderLaser; import buildcraft.core.render.RenderUtils; -import buildcraft.robots.ItemRobot; import buildcraft.robots.EntityRobot; +import buildcraft.robots.ItemRobot; public class RenderRobot extends Render implements IItemRenderer { diff --git a/common/buildcraft/robots/statements/ActionRobotFilter.java b/common/buildcraft/robots/statements/ActionRobotFilter.java index b8c4c428..b45ba39e 100755 --- a/common/buildcraft/robots/statements/ActionRobotFilter.java +++ b/common/buildcraft/robots/statements/ActionRobotFilter.java @@ -29,9 +29,9 @@ 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.robots.DockingStation; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; +import buildcraft.robots.DockingStation; import buildcraft.transport.Pipe; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robots/statements/ActionRobotGotoStation.java b/common/buildcraft/robots/statements/ActionRobotGotoStation.java index 82c63bf0..2e43c076 100644 --- a/common/buildcraft/robots/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/robots/statements/ActionRobotGotoStation.java @@ -21,15 +21,13 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.api.transport.IPipeTile; import buildcraft.core.ItemMapLocation; -import buildcraft.robots.RobotUtils; -import buildcraft.robots.ai.AIRobotGoAndLinkToDock; +import buildcraft.core.statements.BCStatement; +import buildcraft.core.utils.StringUtils; 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; -import buildcraft.transport.Pipe; +import buildcraft.robots.RobotUtils; +import buildcraft.robots.ai.AIRobotGoAndLinkToDock; public class ActionRobotGotoStation extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java b/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java index 7b44b077..3007e9a8 100755 --- a/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java @@ -20,9 +20,9 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; +import buildcraft.core.utils.StringUtils; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; -import buildcraft.core.utils.StringUtils; import buildcraft.transport.gates.StatementSlot; public class ActionStationAcceptItemsInv extends ActionStationInputItems { diff --git a/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java b/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java index 7b983fd8..1863c0ad 100755 --- a/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java @@ -13,9 +13,9 @@ 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.utils.StringUtils; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; -import buildcraft.core.utils.StringUtils; import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TravelingItem; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robots/statements/ActionStationForbidRobot.java b/common/buildcraft/robots/statements/ActionStationForbidRobot.java index b8c989d4..42f0203b 100755 --- a/common/buildcraft/robots/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/robots/statements/ActionStationForbidRobot.java @@ -16,10 +16,10 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; -import buildcraft.robots.ItemRobot; -import buildcraft.robots.DockingStation; import buildcraft.core.statements.BCStatement; import buildcraft.core.utils.StringUtils; +import buildcraft.robots.DockingStation; +import buildcraft.robots.ItemRobot; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; diff --git a/common/buildcraft/robots/statements/ActionStationInputItems.java b/common/buildcraft/robots/statements/ActionStationInputItems.java index 4db624f2..353d7e7e 100755 --- a/common/buildcraft/robots/statements/ActionStationInputItems.java +++ b/common/buildcraft/robots/statements/ActionStationInputItems.java @@ -13,9 +13,9 @@ import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.core.inventory.filters.StatementParameterStackFilter; +import buildcraft.core.statements.BCStatement; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; -import buildcraft.core.statements.BCStatement; import buildcraft.transport.gates.StatementSlot; public abstract class ActionStationInputItems extends BCStatement implements IActionInternal { diff --git a/common/buildcraft/robots/statements/ActionStationRequestItems.java b/common/buildcraft/robots/statements/ActionStationRequestItems.java index 2f84d5d5..668a3935 100755 --- a/common/buildcraft/robots/statements/ActionStationRequestItems.java +++ b/common/buildcraft/robots/statements/ActionStationRequestItems.java @@ -20,9 +20,9 @@ import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.StatementParameterItemStack; import buildcraft.core.inventory.ITransactor; import buildcraft.core.inventory.Transactor; +import buildcraft.core.utils.StringUtils; import buildcraft.robots.DockingStation; import buildcraft.robots.EntityRobot; -import buildcraft.core.utils.StringUtils; import buildcraft.transport.gates.StatementSlot; public class ActionStationRequestItems extends ActionStationInputItems { diff --git a/common/buildcraft/robots/statements/RobotsActionProvider.java b/common/buildcraft/robots/statements/RobotsActionProvider.java index f62567b2..c3a23ebf 100755 --- a/common/buildcraft/robots/statements/RobotsActionProvider.java +++ b/common/buildcraft/robots/statements/RobotsActionProvider.java @@ -27,7 +27,6 @@ import buildcraft.api.statements.IActionExternal; import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IActionProvider; import buildcraft.api.statements.IStatementContainer; -import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; import buildcraft.robots.DockingStation; import buildcraft.robots.RobotUtils; diff --git a/common/buildcraft/robots/statements/RobotsTriggerProvider.java b/common/buildcraft/robots/statements/RobotsTriggerProvider.java index 6e11a72b..4d5e2014 100755 --- a/common/buildcraft/robots/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/robots/statements/RobotsTriggerProvider.java @@ -17,7 +17,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftSilicon; -import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; @@ -25,7 +24,6 @@ import buildcraft.api.statements.ITriggerProvider; import buildcraft.api.transport.IPipeTile; import buildcraft.robots.DockingStation; import buildcraft.robots.RobotUtils; -import buildcraft.transport.TileGenericPipe; public class RobotsTriggerProvider implements ITriggerProvider { diff --git a/common/buildcraft/robots/statements/TriggerRobotSleep.java b/common/buildcraft/robots/statements/TriggerRobotSleep.java index 8f23f68e..33880ac9 100755 --- a/common/buildcraft/robots/statements/TriggerRobotSleep.java +++ b/common/buildcraft/robots/statements/TriggerRobotSleep.java @@ -12,19 +12,16 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.transport.IPipeTile; -import buildcraft.robots.RobotUtils; -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; -import buildcraft.transport.TileGenericPipe; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; +import buildcraft.robots.RobotUtils; +import buildcraft.robots.ai.AIRobotSleep; public class TriggerRobotSleep extends BCStatement implements ITriggerInternal { diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index 8a4accaf..e242e0ac 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -36,11 +36,11 @@ import buildcraft.core.network.CommandWriter; import buildcraft.core.network.ICommandReceiver; import buildcraft.core.network.PacketCommand; import buildcraft.core.recipes.AssemblyRecipeManager; +import buildcraft.core.utils.StringUtils; +import buildcraft.core.utils.Utils; import buildcraft.robots.EntityRobot; import buildcraft.robots.ResourceIdAssemblyTable; import buildcraft.robots.RobotRegistry; -import buildcraft.core.utils.StringUtils; -import buildcraft.core.utils.Utils; public class TileAssemblyTable extends TileLaserTableBase implements IInventory, IFlexibleCrafter, ICommandReceiver { public String currentRecipeId = ""; diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index e7fefd30..9f8b51c1 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -66,15 +66,15 @@ import buildcraft.core.BlockBuildCraft; import buildcraft.core.CoreConstants; import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.ItemMapLocation; -import buildcraft.robots.ItemRobot; import buildcraft.core.TileBuffer; -import buildcraft.robots.DockingStation; -import buildcraft.robots.EntityRobot; import buildcraft.core.utils.MatrixTranformations; import buildcraft.core.utils.Utils; +import buildcraft.robots.DockingStation; +import buildcraft.robots.EntityRobot; +import buildcraft.robots.ItemRobot; +import buildcraft.robots.RobotStationPluggable; import buildcraft.transport.gates.GateDefinition; import buildcraft.transport.gates.GatePluggable; -import buildcraft.robots.RobotStationPluggable; import buildcraft.transport.render.PipeRendererWorld; public class BlockGenericPipe extends BlockBuildCraft { diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 37cc3441..da5702cd 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -426,8 +426,9 @@ public class ItemFacade extends ItemBuildCraft implements IFacadeItem, IPipePlug if (block == null) { return; } - if (!block.getMaterial().blocksMovement()) + if (!block.getMaterial().blocksMovement()) { return; + } String recipeId = "buildcraft:facade{" + Block.blockRegistry.getNameForObject(block) + "#" + itemStack.getItemDamage() + "}"; diff --git a/common/buildcraft/transport/render/FacadeBlockAccess.java b/common/buildcraft/transport/render/FacadeBlockAccess.java index f82aa0d6..9d205911 100644 --- a/common/buildcraft/transport/render/FacadeBlockAccess.java +++ b/common/buildcraft/transport/render/FacadeBlockAccess.java @@ -9,7 +9,6 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.pluggable.IFacadePluggable; import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.FacadePluggable; import buildcraft.transport.TileGenericPipe; public class FacadeBlockAccess implements IBlockAccess { diff --git a/common/buildcraft/transport/render/FacadeRenderHelper.java b/common/buildcraft/transport/render/FacadeRenderHelper.java index 253a5291..bacfd249 100644 --- a/common/buildcraft/transport/render/FacadeRenderHelper.java +++ b/common/buildcraft/transport/render/FacadeRenderHelper.java @@ -22,7 +22,6 @@ import buildcraft.api.transport.pluggable.PipePluggable; import buildcraft.core.CoreConstants; import buildcraft.core.utils.MatrixTranformations; import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.FacadePluggable; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeRenderState; import buildcraft.transport.TileGenericPipe; From ac2bc7ab97348a42d89a226c754ddb3d87c408ba Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Sun, 8 Feb 2015 10:27:42 -0300 Subject: [PATCH 17/67] fix wooden pipes not respecting blocking bluggables, fixes #2443 --- common/buildcraft/transport/pipes/PipeLogicWood.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/transport/pipes/PipeLogicWood.java b/common/buildcraft/transport/pipes/PipeLogicWood.java index 97ae5279..5f354389 100644 --- a/common/buildcraft/transport/pipes/PipeLogicWood.java +++ b/common/buildcraft/transport/pipes/PipeLogicWood.java @@ -37,8 +37,11 @@ public abstract class PipeLogicWood { break; } } + if (newFacing == null) { + newFacing = ForgeDirection.UNKNOWN; + } - if (newFacing != null && newFacing.ordinal() != meta) { + if (newFacing.ordinal() != meta) { pipe.container.getWorldObj().setBlockMetadataWithNotify(pipe.container.xCoord, pipe.container.yCoord, pipe.container.zCoord, newFacing.ordinal(), 3); pipe.container.scheduleRenderUpdate(); } @@ -67,6 +70,10 @@ public abstract class PipeLogicWood { return true; } + if (pipe.container.hasBlockingPluggable(side)) { + return false; + } + TileEntity tile = tileBuffer[side.ordinal()].getTile(); return isValidConnectingTile(tile); } From 9029c04dd23c03e53d0054b7e514e8b30631d4e1 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Mon, 9 Feb 2015 21:59:52 -0300 Subject: [PATCH 18/67] fix the robot smoke particle causing fps drops in certain cases --- common/buildcraft/robots/EntityRobotEnergyParticle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/robots/EntityRobotEnergyParticle.java b/common/buildcraft/robots/EntityRobotEnergyParticle.java index 015d25b3..1ff71d7d 100755 --- a/common/buildcraft/robots/EntityRobotEnergyParticle.java +++ b/common/buildcraft/robots/EntityRobotEnergyParticle.java @@ -81,7 +81,7 @@ public class EntityRobotEnergyParticle extends EntityFX { if (this.posY == this.prevPosY) { this.motionX *= 1.1D; - this.motionY *= 1.1D; + this.motionY = 0.001D; this.motionZ *= 1.1D; } From 7a3822f4f657b166091f2af27379ba1c41a02af3 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Mon, 9 Feb 2015 22:01:37 -0300 Subject: [PATCH 19/67] make robots face where they are traveling to --- common/buildcraft/robots/ai/AIRobotGotoBlock.java | 2 ++ common/buildcraft/robots/ai/AIRobotPumpBlock.java | 5 ----- common/buildcraft/robots/ai/AIRobotStraightMoveTo.java | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/common/buildcraft/robots/ai/AIRobotGotoBlock.java b/common/buildcraft/robots/ai/AIRobotGotoBlock.java index cb043a35..67a5fdf7 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoBlock.java +++ b/common/buildcraft/robots/ai/AIRobotGotoBlock.java @@ -41,6 +41,7 @@ public class AIRobotGotoBlock extends AIRobotGoto { finalX = x; finalY = y; finalZ = z; + robot.aimItemAt((int) Math.floor(finalX), (int) Math.floor(finalY), (int) Math.floor(finalZ)); } public AIRobotGotoBlock(EntityRobotBase robot, int x, int y, int z, double iMaxDistance) { @@ -55,6 +56,7 @@ public class AIRobotGotoBlock extends AIRobotGoto { finalX = path.getLast().x; finalY = path.getLast().y; finalZ = path.getLast().z; + robot.aimItemAt((int) Math.floor(finalX), (int) Math.floor(finalY), (int) Math.floor(finalZ)); setNextInPath(); } diff --git a/common/buildcraft/robots/ai/AIRobotPumpBlock.java b/common/buildcraft/robots/ai/AIRobotPumpBlock.java index 98d30685..7c541ac9 100644 --- a/common/buildcraft/robots/ai/AIRobotPumpBlock.java +++ b/common/buildcraft/robots/ai/AIRobotPumpBlock.java @@ -66,11 +66,6 @@ public class AIRobotPumpBlock extends AIRobot { } - @Override - public void end() { - robot.aimItemAt(0, 1, 0); - } - @Override public int getEnergyCost() { return 20; diff --git a/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java b/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java index d08a2ca2..34e7c7d4 100755 --- a/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java +++ b/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java @@ -26,6 +26,7 @@ public class AIRobotStraightMoveTo extends AIRobotGoto { x = ix; y = iy; z = iz; + robot.aimItemAt((int) Math.floor(x), (int) Math.floor(y), (int) Math.floor(z)); } @Override From 90da2ea4d96b531d8b98bfaea299f51a7e5d9983 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Sat, 14 Feb 2015 15:59:15 -0300 Subject: [PATCH 20/67] robots drop their inventory when destroyed --- common/buildcraft/robots/EntityRobot.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/buildcraft/robots/EntityRobot.java b/common/buildcraft/robots/EntityRobot.java index 426144d9..a8411579 100644 --- a/common/buildcraft/robots/EntityRobot.java +++ b/common/buildcraft/robots/EntityRobot.java @@ -948,6 +948,14 @@ public class EntityRobot extends EntityRobotBase implements NBTUtils.getItemData(robotStack).setTag("board", originalBoardNBT); NBTUtils.getItemData(robotStack).setInteger("energy", battery.getEnergyStored()); entityDropItem(robotStack, 0); + if (itemInUse != null) { + entityDropItem(itemInUse, 0); + } + for (ItemStack element : inv) { + if (element != null) { + entityDropItem(element, 0); + } + } getRegistry().killRobot(this); } From efbf47ba496862a5201cb66bae95ba7644437a74 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Sat, 14 Feb 2015 16:11:45 -0300 Subject: [PATCH 21/67] fix the PathFindingSearch algorithm pathfinding multiple times the same block --- .../core/utils/concurrency/PathFinding.java | 14 +++++ .../utils/concurrency/PathFindingSearch.java | 57 +++++++++++++------ .../robots/ai/AIRobotSearchBlock.java | 2 +- 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/common/buildcraft/core/utils/concurrency/PathFinding.java b/common/buildcraft/core/utils/concurrency/PathFinding.java index 427414c7..76e78b82 100755 --- a/common/buildcraft/core/utils/concurrency/PathFinding.java +++ b/common/buildcraft/core/utils/concurrency/PathFinding.java @@ -34,6 +34,7 @@ public class PathFinding implements IIterableAlgorithm { private IBlockFilter pathFound; private IZone zone; private double maxDistanceToEnd = 0; + private float maxTotalDistance = 0; private HashMap openList = new HashMap(); private HashMap closedList = new HashMap(); @@ -65,6 +66,13 @@ public class PathFinding implements IIterableAlgorithm { maxDistanceToEnd = iMaxDistanceToEnd; } + public PathFinding(World iWorld, BlockIndex iStart, BlockIndex iEnd, double iMaxDistanceToEnd, + float iMaxTotalDistance) { + this(iWorld, iStart, iEnd, iMaxDistanceToEnd); + + maxTotalDistance = iMaxTotalDistance; + } + @Override public void iterate() { iterate(PATH_ITERATIONS); @@ -147,6 +155,12 @@ public class PathFinding implements IIterableAlgorithm { nextNode.totalWeight = nextNode.movementCost + nextNode.destinationCost; + if (maxTotalDistance > 0 && nextNode.totalWeight > maxTotalDistance) { + if (!closedList.containsKey(nextNode.index)) { + closedList.put(nextNode.index, nextNode); + } + continue; + } if (closedList.containsKey(nextNode.index)) { continue; } else if (openList.containsKey(nextNode.index)) { diff --git a/common/buildcraft/core/utils/concurrency/PathFindingSearch.java b/common/buildcraft/core/utils/concurrency/PathFindingSearch.java index 340d8236..f4b0626d 100644 --- a/common/buildcraft/core/utils/concurrency/PathFindingSearch.java +++ b/common/buildcraft/core/utils/concurrency/PathFindingSearch.java @@ -32,6 +32,7 @@ public class PathFindingSearch implements IIterableAlgorithm { private List pathFinders; private IBlockFilter pathFound; private IZone zone; + private float maxDistance; private int searchRadius; private int searchX; @@ -39,11 +40,14 @@ public class PathFindingSearch implements IIterableAlgorithm { private int searchZ; private int searchHeight; + public PathFindingSearch(World iWorld, BlockIndex iStart, IBlockFilter iPathFound, float iMaxDistance, IZone iZone) { world = iWorld; start = iStart; pathFound = iPathFound; + maxDistance = iMaxDistance; + pathFinders = new LinkedList(); searchRadius = 1; searchX = -1; @@ -67,32 +71,51 @@ public class PathFindingSearch implements IIterableAlgorithm { int currZ = start.z + searchZ; if (0 <= currY && currY <= searchHeight) { if (isTarget(currX, currY, currZ)) { - pathFinders.add(new PathFinding(world, start, new BlockIndex(currX, currY, currZ))); + pathFinders.add(new PathFinding(world, start, new BlockIndex(currX, currY, currZ), 0, maxDistance)); } } - searchY += 1; - if (searchY > searchRadius) { - searchY = -searchRadius; - searchZ += 1; - if (searchZ > searchRadius) { - searchZ = -searchRadius; - searchX += 1; - if (searchX > searchRadius) { - searchRadius += 1; - searchX = -searchRadius; - searchY = -searchRadius; - searchZ = -searchRadius; - } - } - searchHeight = getSearchHeight(start.x + searchX, start.z + searchZ); - } + nextSearchStep(); + if (pathFinders.size() >= 5) { return; } } } + private void nextSearchStep() { + // Step through each block in a hollow cube of size (searchRadius * 2 -1), if done + // add 1 to the radius and start over. + + // Step to the next Y + if (Math.abs(searchX) == searchRadius || Math.abs(searchZ) == searchRadius) { + searchY += 1; + } else { + searchY += searchRadius * 2; + } + + if (searchY > searchRadius) { + // Step to the next Z + searchY = -searchRadius; + searchZ += 1; + + if (searchZ > searchRadius) { + // Step to the next X + searchZ = -searchRadius; + searchX += 1; + + if (searchX > searchRadius) { + // Step to the next radius + searchRadius += 1; + searchX = -searchRadius; + searchY = -searchRadius; + searchZ = -searchRadius; + } + } + searchHeight = getSearchHeight(start.x + searchX, start.z + searchZ); + } + } + private boolean isTarget(int x, int y, int z) { if (zone != null && !zone.contains(x, y, z)) { return false; diff --git a/common/buildcraft/robots/ai/AIRobotSearchBlock.java b/common/buildcraft/robots/ai/AIRobotSearchBlock.java index 054a3d96..2a5c67cc 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchBlock.java @@ -39,7 +39,7 @@ public class AIRobotSearchBlock extends AIRobot { @Override public void start() { - blockScanner = new PathFindingSearch(robot.worldObj, new BlockIndex(robot), pathFound, 64, robot.getZoneToWork()); + blockScanner = new PathFindingSearch(robot.worldObj, new BlockIndex(robot), pathFound, 96, robot.getZoneToWork()); blockScannerJob = new IterableAlgorithmRunner(blockScanner, 40000); blockScannerJob.start(); } From c2466911d092ff59359b148ed75ccdae5faca44f Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Wed, 11 Feb 2015 20:40:51 -0300 Subject: [PATCH 22/67] refactor the stripes pipe's extension code into a separate handler --- common/buildcraft/BuildCraftTransport.java | 2 + .../transport/pipes/PipeItemsStripes.java | 64 +------------ .../stripes/StripesHandlerPipes.java | 95 +++++++++++++++++++ 3 files changed, 98 insertions(+), 63 deletions(-) create mode 100644 common/buildcraft/transport/stripes/StripesHandlerPipes.java diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 2b5ca2b9..2f482c84 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -151,6 +151,7 @@ import buildcraft.transport.statements.TriggerPipeSignal; import buildcraft.transport.statements.TriggerRedstoneFaderInput; import buildcraft.transport.stripes.StripesHandlerArrow; import buildcraft.transport.stripes.StripesHandlerBucket; +import buildcraft.transport.stripes.StripesHandlerPipes; import buildcraft.transport.stripes.StripesHandlerRightClick; import buildcraft.transport.stripes.StripesHandlerShears; @@ -462,6 +463,7 @@ public class BuildCraftTransport extends BuildCraftMod { PipeManager.registerStripesHandler(new StripesHandlerBucket()); PipeManager.registerStripesHandler(new StripesHandlerArrow()); PipeManager.registerStripesHandler(new StripesHandlerShears()); + PipeManager.registerStripesHandler(new StripesHandlerPipes()); PipeManager.registerPipePluggable(FacadePluggable.class, "facade"); PipeManager.registerPipePluggable(GatePluggable.class, "gate"); diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 5fd89b53..87501a48 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -26,15 +26,12 @@ import cofh.api.energy.IEnergyHandler; import buildcraft.BuildCraftTransport; import buildcraft.api.core.IIconProvider; import buildcraft.api.core.Position; -import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IStripesHandler; import buildcraft.api.transport.IStripesHandler.StripesHandlerType; import buildcraft.api.transport.IStripesPipe; import buildcraft.api.transport.PipeManager; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtils; -import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.ItemPipe; import buildcraft.transport.Pipe; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.PipeTransportItems; @@ -102,7 +99,6 @@ public class PipeItemsStripes extends Pipe implements IEnerg /** * Check if there's a handler for this item type. */ - for (IStripesHandler handler : PipeManager.stripesHandlers) { if (handler.getType() == StripesHandlerType.ITEM_USE && handler.shouldHandle(stack)) { @@ -117,45 +113,7 @@ public class PipeItemsStripes extends Pipe implements IEnerg * Special, generic actions not handled by the handler. */ - if (convertPipe(transport, event.item)) { - int moves = 0; - while (stack.stackSize > 0) { - if (getWorld().getBlock((int) p.x, (int) p.y, (int) p.z) != Blocks.air) { - break; - } - stack.getItem().onItemUse(new ItemStack(stack.getItem(), 1, stack.getItemDamage()), - player, getWorld(), (int) p.x, (int) p.y, (int) p.z, 1, 0, 0, 0 - ); - stack.stackSize--; - p.moveForwards(1.0); - moves++; - } - if (getWorld().getBlock((int) p.x, (int) p.y, (int) p.z) != Blocks.air) { - p.moveBackwards(1.0); - stack.stackSize++; - getWorld().setBlockToAir((int) p.x, (int) p.y, (int) p.z); - } - - BuildCraftTransport.pipeItemsStripes.onItemUse(new ItemStack( - BuildCraftTransport.pipeItemsStripes, 1, this.container.getItemMetadata()), player, getWorld(), (int) p.x, - (int) p.y, (int) p.z, 1, 0, 0, 0 - ); - this.container.initializeFromItemMetadata(stack.getItemDamage() - 1); - - if (stack.stackSize > 0) { - TileEntity targetTile = getWorld().getTileEntity((int) p.x, (int) p.y, (int) p.z); - if (targetTile instanceof IPipeTile) { - TravelingItem newItem = TravelingItem.make( - container.xCoord + 0.5, - container.yCoord + TransportUtils.getPipeFloorOf( - new ItemStack(BuildCraftTransport.pipeItemsStripes)), - container.zCoord + 0.5, stack.copy()); - ((PipeTransportItems) ((Pipe) ((IPipeTile) targetTile).getPipe()).transport).injectItem(newItem, event.direction.getOpposite()); - - stack.stackSize = 0; - } - } - } else if (stack.getItem() instanceof ItemBlock) { + if (stack.getItem() instanceof ItemBlock) { if (getWorld().getBlock((int) p.x, (int) p.y, (int) p.z) == Blocks.air) { stack.tryPlaceItemIntoWorld( player, @@ -190,26 +148,6 @@ public class PipeItemsStripes extends Pipe implements IEnerg transport.injectItem(newItem, direction); } - private boolean convertPipe(PipeTransportItems pipe, TravelingItem item) { - if (item.getItemStack().getItem() instanceof ItemPipe) { - if (!(item.getItemStack().getItem() == BuildCraftTransport.pipeItemsStripes)) { - Pipe newPipe = BlockGenericPipe.createPipe(item.getItemStack().getItem()); - newPipe.setTile(this.container); - this.container.pipe = newPipe; - - item.getItemStack().stackSize--; - - if (item.getItemStack().stackSize <= 0) { - ((PipeTransportItems) newPipe.transport).items.remove(item); - } - - return true; - } - } - - return false; - } - @Override public IIconProvider getIconProvider() { return BuildCraftTransport.instance.pipeIconProvider; diff --git a/common/buildcraft/transport/stripes/StripesHandlerPipes.java b/common/buildcraft/transport/stripes/StripesHandlerPipes.java new file mode 100644 index 00000000..43f6987f --- /dev/null +++ b/common/buildcraft/transport/stripes/StripesHandlerPipes.java @@ -0,0 +1,95 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.stripes; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.BuildCraftTransport; +import buildcraft.api.core.Position; +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesPipe; +import buildcraft.transport.BlockGenericPipe; +import buildcraft.transport.ItemPipe; +import buildcraft.transport.Pipe; +import buildcraft.transport.PipeTransportItems; +import buildcraft.transport.TileGenericPipe; + +public class StripesHandlerPipes implements IStripesHandler { + + @Override + public StripesHandlerType getType() { + return StripesHandlerType.ITEM_USE; + } + + @Override + public boolean shouldHandle(ItemStack stack) { + return stack.getItem() instanceof ItemPipe; + } + + @Override + public boolean handle(World world, int x, int y, int z, + ForgeDirection direction, ItemStack stack, EntityPlayer player, + IStripesPipe pipe) { + + if (!(stack.getItem() instanceof ItemPipe) || (stack.getItem() == BuildCraftTransport.pipeItemsStripes)) { + return false; + } + + if (world.getBlock(x, y, z) != Blocks.air) { + return false; + } + + Position p = new Position(x, y, z, direction); + p.moveBackwards(1.0d); + + TileEntity tile = world.getTileEntity((int) p.x, (int) p.y, (int) p.z); + if (!(tile instanceof TileGenericPipe)) { + return false; + } + TileGenericPipe pipeTile = (TileGenericPipe) tile; + if (!(pipeTile.pipe.transport instanceof PipeTransportItems)) { + return false; + } + + // Checks done, start to actually do stuff + if (!copyPipeTo(world, pipeTile, x, y, z, player)) { + return false; + } + + pipeTile.pipe.transport.container.initializeFromItemMetadata(stack.getItemDamage() - 1); + Pipe newPipe = BlockGenericPipe.createPipe(stack.getItem()); + newPipe.setTile(pipeTile.pipe.container); + pipeTile.pipe.container.pipe = newPipe; + pipeTile.updateEntity(); // Needed so that the tile does computeConnections() + + ItemStack transportStack = stack.copy(); + stack.stackSize = 0; + transportStack.stackSize--; + if (transportStack.stackSize > 0) { + pipeTile.pipe.container.injectItem(transportStack, true, direction.getOpposite()); + } + + return true; + } + + private boolean copyPipeTo(World world, TileGenericPipe pipeTile, int x, int y, int z, EntityPlayer player) { + int meta = pipeTile.pipe.container.getItemMetadata(); + ItemStack stack = new ItemStack(BuildCraftTransport.pipeItemsStripes, 1, meta); + if (!BuildCraftTransport.pipeItemsStripes.onItemUse(stack, player, world, x, y, z, 1, 0, 0, 0)) { + return false; + } + return true; + } +} From 2898da9f59029c22fa2539ad7991adf912d7db6d Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Thu, 12 Feb 2015 20:28:55 -0300 Subject: [PATCH 23/67] add stripes handler for interaction with entities --- common/buildcraft/BuildCraftTransport.java | 2 + .../stripes/StripesHandlerEntityInteract.java | 86 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 2f482c84..52358b08 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -151,6 +151,7 @@ import buildcraft.transport.statements.TriggerPipeSignal; import buildcraft.transport.statements.TriggerRedstoneFaderInput; import buildcraft.transport.stripes.StripesHandlerArrow; import buildcraft.transport.stripes.StripesHandlerBucket; +import buildcraft.transport.stripes.StripesHandlerEntityInteract; import buildcraft.transport.stripes.StripesHandlerPipes; import buildcraft.transport.stripes.StripesHandlerRightClick; import buildcraft.transport.stripes.StripesHandlerShears; @@ -464,6 +465,7 @@ public class BuildCraftTransport extends BuildCraftMod { PipeManager.registerStripesHandler(new StripesHandlerArrow()); PipeManager.registerStripesHandler(new StripesHandlerShears()); PipeManager.registerStripesHandler(new StripesHandlerPipes()); + PipeManager.registerStripesHandler(new StripesHandlerEntityInteract()); PipeManager.registerPipePluggable(FacadePluggable.class, "facade"); PipeManager.registerPipePluggable(GatePluggable.class, "gate"); diff --git a/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java b/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java new file mode 100644 index 00000000..222923d9 --- /dev/null +++ b/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java @@ -0,0 +1,86 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.stripes; + +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; + +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesPipe; + +public class StripesHandlerEntityInteract implements IStripesHandler { + + @Override + public StripesHandlerType getType() { + return StripesHandlerType.ITEM_USE; + } + + @Override + public boolean shouldHandle(ItemStack stack) { + return true; + } + + @Override + public boolean handle(World world, int x, int y, int z, + ForgeDirection direction, ItemStack stack, EntityPlayer player, + IStripesPipe pipe) { + + AxisAlignedBB box = AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); + List entities = world.getEntitiesWithinAABBExcludingEntity(null, box); + if (entities.size() <= 0) { + return false; + } + + List livingEntities = new LinkedList(); + for (Object entityObj : entities) { + if (entityObj instanceof EntityLivingBase) { + livingEntities.add((EntityLivingBase) entityObj); + } + } + + player.setCurrentItemOrArmor(0, stack); + + boolean successful = false; + Collections.shuffle(livingEntities); + while (livingEntities.size() > 0) { + EntityLivingBase entity = livingEntities.remove(0); + + if (!player.interactWith(entity)) { + continue; + } + successful = true; + dropItemsExcept(stack, player, pipe, direction); + } + if (stack.stackSize > 0) { + pipe.sendItem(stack, direction.getOpposite()); + } + + return successful; + } + + private void dropItemsExcept(ItemStack stack, EntityPlayer player, IStripesPipe pipe, ForgeDirection direction) { + for (int i = 0; i < player.inventory.getSizeInventory(); i++) { + ItemStack invStack = player.inventory.getStackInSlot(i); + if (invStack != null && invStack != stack) { + player.inventory.setInventorySlotContents(i, null); + pipe.sendItem(invStack, direction.getOpposite()); + } + } + } + +} From 8c50af6e9a62bc1eb3b3b63bcf0e749bf1559931 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Thu, 12 Feb 2015 22:05:05 -0300 Subject: [PATCH 24/67] refactor the stripes pipe's block placing code into a separate handler --- common/buildcraft/BuildCraftTransport.java | 2 + .../transport/pipes/PipeItemsStripes.java | 18 -------- .../stripes/StripesHandlerPlaceBlock.java | 43 +++++++++++++++++++ 3 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 52358b08..eff65b22 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -153,6 +153,7 @@ import buildcraft.transport.stripes.StripesHandlerArrow; import buildcraft.transport.stripes.StripesHandlerBucket; import buildcraft.transport.stripes.StripesHandlerEntityInteract; import buildcraft.transport.stripes.StripesHandlerPipes; +import buildcraft.transport.stripes.StripesHandlerPlaceBlock; import buildcraft.transport.stripes.StripesHandlerRightClick; import buildcraft.transport.stripes.StripesHandlerShears; @@ -466,6 +467,7 @@ public class BuildCraftTransport extends BuildCraftMod { PipeManager.registerStripesHandler(new StripesHandlerShears()); PipeManager.registerStripesHandler(new StripesHandlerPipes()); PipeManager.registerStripesHandler(new StripesHandlerEntityInteract()); + PipeManager.registerStripesHandler(new StripesHandlerPlaceBlock()); PipeManager.registerPipePluggable(FacadePluggable.class, "facade"); PipeManager.registerPipePluggable(GatePluggable.class, "gate"); diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 87501a48..a09a0d35 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -108,24 +108,6 @@ public class PipeItemsStripes extends Pipe implements IEnerg } } } - - /** - * Special, generic actions not handled by the handler. - */ - - if (stack.getItem() instanceof ItemBlock) { - if (getWorld().getBlock((int) p.x, (int) p.y, (int) p.z) == Blocks.air) { - stack.tryPlaceItemIntoWorld( - player, - getWorld(), (int) p.x, (int) p.y, (int) p.z, 1, 0.0f, 0.0f, - 0.0f); - } - } else { - stack.tryPlaceItemIntoWorld( - player, - getWorld(), (int) p.x, (int) p.y, (int) p.z, 1, 0.0f, 0.0f, - 0.0f); - } } @Override diff --git a/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java b/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java new file mode 100644 index 00000000..64692ba5 --- /dev/null +++ b/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. + */ +package buildcraft.transport.stripes; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesPipe; + +public class StripesHandlerPlaceBlock implements IStripesHandler { + + @Override + public StripesHandlerType getType() { + return StripesHandlerType.ITEM_USE; + } + + @Override + public boolean shouldHandle(ItemStack stack) { + return stack.getItem() instanceof ItemBlock; + } + + @Override + public boolean handle(World world, int x, int y, int z, + ForgeDirection direction, ItemStack stack, EntityPlayer player, + IStripesPipe pipe) { + if (!world.isAirBlock(x, y, z)) { + return false; + } + return stack.tryPlaceItemIntoWorld(player, world, x, y, z, 1, 0.0f, 0.0f, 0.0f); + } + +} From 6ee68a529652d66f4ed5d059870ae72301e4511c Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Thu, 12 Feb 2015 22:47:17 -0300 Subject: [PATCH 25/67] clean stripes api by canceling the DropItem event if it was handled, and fixed several item destroying bugs --- .../transport/pipes/PipeItemsStripes.java | 1 + .../stripes/StripesHandlerArrow.java | 6 ++++- .../stripes/StripesHandlerBucket.java | 12 ++++++--- .../stripes/StripesHandlerPipes.java | 8 +++--- .../stripes/StripesHandlerRightClick.java | 3 ++- .../stripes/StripesHandlerShears.java | 25 ++++++++++++++----- 6 files changed, 38 insertions(+), 17 deletions(-) diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index a09a0d35..9ac0f3b1 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -104,6 +104,7 @@ public class PipeItemsStripes extends Pipe implements IEnerg && handler.shouldHandle(stack)) { if (handler.handle(getWorld(), (int) p.x, (int) p.y, (int) p.z, event.direction, stack, player, this)) { + event.entity = null; return; } } diff --git a/common/buildcraft/transport/stripes/StripesHandlerArrow.java b/common/buildcraft/transport/stripes/StripesHandlerArrow.java index cdcb9db0..132cb364 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerArrow.java +++ b/common/buildcraft/transport/stripes/StripesHandlerArrow.java @@ -27,7 +27,6 @@ public class StripesHandlerArrow implements IStripesHandler { public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, IStripesPipe pipe) { - stack.stackSize--; EntityArrow entityArrow = new EntityArrow(world, player, 0); entityArrow.setPosition(x + 0.5d, y + 0.5d, z + 0.5d); @@ -38,6 +37,11 @@ public class StripesHandlerArrow implements IStripesHandler { entityArrow.motionZ = direction.offsetZ * 1.8d + world.rand.nextGaussian() * 0.007499999832361937D; world.spawnEntityInWorld(entityArrow); + stack.stackSize--; + if (stack.stackSize > 0) { + pipe.sendItem(stack, direction.getOpposite()); + } + return true; } diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java index c460f927..b2dd9e3b 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java +++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java @@ -39,8 +39,11 @@ public class StripesHandlerBucket implements IStripesHandler { Block underblock = world.getBlock(x, y - 1, z); if (((ItemBucket) stack.getItem()).tryPlaceContainedLiquid(world, x, y - 1, z)) { - stack.stackSize = 0; pipe.sendItem(emptyBucket, direction.getOpposite()); + stack.stackSize--; + if(stack.stackSize > 0) { + pipe.sendItem(stack, direction.getOpposite()); + } return true; } else { @@ -63,14 +66,15 @@ public class StripesHandlerBucket implements IStripesHandler { if (filledBucket != null) { world.setBlockToAir(x, y - 1, z); - stack.stackSize = 0; pipe.sendItem(filledBucket, direction.getOpposite()); + stack.stackSize--; + if(stack.stackSize > 0) { + pipe.sendItem(stack, direction.getOpposite()); + } return true; } } - - return false; } return false; } diff --git a/common/buildcraft/transport/stripes/StripesHandlerPipes.java b/common/buildcraft/transport/stripes/StripesHandlerPipes.java index 43f6987f..77460f76 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPipes.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPipes.java @@ -74,11 +74,9 @@ public class StripesHandlerPipes implements IStripesHandler { pipeTile.pipe.container.pipe = newPipe; pipeTile.updateEntity(); // Needed so that the tile does computeConnections() - ItemStack transportStack = stack.copy(); - stack.stackSize = 0; - transportStack.stackSize--; - if (transportStack.stackSize > 0) { - pipeTile.pipe.container.injectItem(transportStack, true, direction.getOpposite()); + stack.stackSize--; + if (stack.stackSize > 0) { + pipeTile.pipe.container.injectItem(stack, true, direction.getOpposite()); } return true; diff --git a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java index 99b05acc..75511144 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java +++ b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java @@ -29,7 +29,8 @@ public class StripesHandlerRightClick implements IStripesHandler { public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, IStripesPipe pipe) { - stack.getItem().onItemRightClick(stack, world, player); + ItemStack remainingStack = stack.getItem().onItemRightClick(stack, world, player); + pipe.sendItem(remainingStack, direction.getOpposite()); return true; } diff --git a/common/buildcraft/transport/stripes/StripesHandlerShears.java b/common/buildcraft/transport/stripes/StripesHandlerShears.java index 342d03e3..a695b060 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerShears.java +++ b/common/buildcraft/transport/stripes/StripesHandlerShears.java @@ -1,12 +1,16 @@ package buildcraft.transport.stripes; +import java.util.List; + import net.minecraft.block.Block; -import net.minecraft.block.BlockLeavesBase; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.common.IShearable; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.transport.IStripesHandler; @@ -30,11 +34,20 @@ public class StripesHandlerShears implements IStripesHandler { IStripesPipe pipe) { Block block = world.getBlock(x, y, z); - if (block instanceof BlockLeavesBase) { - world.playSoundEffect(x, y, z, Block.soundTypeGrass.getBreakSound(), 1, 1); - world.setBlockToAir(x, y, z); - stack.damageItem(1, player); - return true; + if (block instanceof IShearable) { + IShearable shearableBlock = (IShearable)block; + if(shearableBlock.isShearable(stack, world, x, y, z)) { + world.playSoundEffect(x, y, z, Block.soundTypeGrass.getBreakSound(), 1, 1); + List drops = shearableBlock.onSheared(stack, world, x, y, z, + EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); + world.setBlockToAir(x, y, z); + stack.damageItem(1, player); + pipe.sendItem(stack, direction.getOpposite()); + for (ItemStack dropStack : drops) { + pipe.sendItem(dropStack, direction.getOpposite()); + } + return true; + } } return false; From f6fe4ffcb26e1382c99f065054ee3282fb498896 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Thu, 12 Feb 2015 23:32:57 -0300 Subject: [PATCH 26/67] add default stripes handler and fix style --- .../transport/pipes/PipeItemsStripes.java | 11 ++++- .../stripes/StripesHandlerBucket.java | 4 +- .../stripes/StripesHandlerDefault.java | 46 +++++++++++++++++++ .../stripes/StripesHandlerShears.java | 4 +- 4 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 common/buildcraft/transport/stripes/StripesHandlerDefault.java diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 9ac0f3b1..620aab57 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -12,9 +12,7 @@ import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.WorldServer; @@ -38,9 +36,13 @@ import buildcraft.transport.PipeTransportItems; import buildcraft.transport.TileGenericPipe; import buildcraft.transport.TravelingItem; import buildcraft.transport.pipes.events.PipeEventItem; +import buildcraft.transport.stripes.StripesHandlerDefault; import buildcraft.transport.utils.TransportUtils; public class PipeItemsStripes extends Pipe implements IEnergyHandler, IStripesPipe { + + private IStripesHandler defaultItemsHandler = new StripesHandlerDefault(); + public PipeItemsStripes(Item item) { super(new PipeTransportItems(), item); } @@ -109,6 +111,11 @@ public class PipeItemsStripes extends Pipe implements IEnerg } } } + + if(defaultItemsHandler.handle(getWorld(), (int) p.x, (int) p.y, (int) p.z, + event.direction, stack, player, this)) { + event.entity = null; + } } @Override diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java index b2dd9e3b..903b3a5a 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java +++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java @@ -41,7 +41,7 @@ public class StripesHandlerBucket implements IStripesHandler { if (((ItemBucket) stack.getItem()).tryPlaceContainedLiquid(world, x, y - 1, z)) { pipe.sendItem(emptyBucket, direction.getOpposite()); stack.stackSize--; - if(stack.stackSize > 0) { + if (stack.stackSize > 0) { pipe.sendItem(stack, direction.getOpposite()); } @@ -68,7 +68,7 @@ public class StripesHandlerBucket implements IStripesHandler { pipe.sendItem(filledBucket, direction.getOpposite()); stack.stackSize--; - if(stack.stackSize > 0) { + if (stack.stackSize > 0) { pipe.sendItem(stack, direction.getOpposite()); } diff --git a/common/buildcraft/transport/stripes/StripesHandlerDefault.java b/common/buildcraft/transport/stripes/StripesHandlerDefault.java new file mode 100644 index 00000000..3b7e3d4f --- /dev/null +++ b/common/buildcraft/transport/stripes/StripesHandlerDefault.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. + */ +package buildcraft.transport.stripes; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesPipe; + +public class StripesHandlerDefault implements IStripesHandler { + + @Override + public StripesHandlerType getType() { + return StripesHandlerType.ITEM_USE; + } + + @Override + public boolean shouldHandle(ItemStack stack) { + return true; + } + + @Override + public boolean handle(World world, int x, int y, int z, + ForgeDirection direction, ItemStack stack, EntityPlayer player, + IStripesPipe pipe) { + if (!world.isAirBlock(x, y, z)) { + return false; + } + if (!stack.tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0.0f, 0.0f, 0.0f)) { + return false; + } + pipe.sendItem(stack, direction.getOpposite()); + return true; + } + +} diff --git a/common/buildcraft/transport/stripes/StripesHandlerShears.java b/common/buildcraft/transport/stripes/StripesHandlerShears.java index a695b060..ae819d19 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerShears.java +++ b/common/buildcraft/transport/stripes/StripesHandlerShears.java @@ -35,8 +35,8 @@ public class StripesHandlerShears implements IStripesHandler { Block block = world.getBlock(x, y, z); if (block instanceof IShearable) { - IShearable shearableBlock = (IShearable)block; - if(shearableBlock.isShearable(stack, world, x, y, z)) { + IShearable shearableBlock = (IShearable) block; + if (shearableBlock.isShearable(stack, world, x, y, z)) { world.playSoundEffect(x, y, z, Block.soundTypeGrass.getBreakSound(), 1, 1); List drops = shearableBlock.onSheared(stack, world, x, y, z, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); From ee681b19e78a4b74ff4479847a1b2d471fdced2b Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Mon, 16 Feb 2015 15:34:19 -0300 Subject: [PATCH 27/67] fix robots not consuming energy and getting free energy when placed --- common/buildcraft/robots/EntityRobot.java | 2 +- common/buildcraft/robots/ai/AIRobotBreak.java | 2 +- common/buildcraft/robots/ai/AIRobotCraftGeneric.java | 5 +++++ common/buildcraft/robots/ai/AIRobotFetchItem.java | 5 +++++ common/buildcraft/robots/ai/AIRobotMain.java | 2 +- common/buildcraft/robots/ai/AIRobotPumpBlock.java | 2 +- common/buildcraft/robots/ai/AIRobotSearchBlock.java | 6 ++++++ common/buildcraft/robots/ai/AIRobotSearchEntity.java | 5 +++++ .../robots/ai/AIRobotSearchRandomGroundBlock.java | 5 +++++ common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java | 2 +- common/buildcraft/transport/BlockGenericPipe.java | 1 - 11 files changed, 31 insertions(+), 6 deletions(-) diff --git a/common/buildcraft/robots/EntityRobot.java b/common/buildcraft/robots/EntityRobot.java index a8411579..30d3f7bb 100644 --- a/common/buildcraft/robots/EntityRobot.java +++ b/common/buildcraft/robots/EntityRobot.java @@ -116,7 +116,7 @@ public class EntityRobot extends EntityRobotBase implements private NBTTagList stackRequestNBT; - private RFBattery battery = new RFBattery(MAX_ENERGY, MAX_ENERGY, 0); + private RFBattery battery = new RFBattery(MAX_ENERGY, MAX_ENERGY, 100); private boolean firstUpdateDone = false; diff --git a/common/buildcraft/robots/ai/AIRobotBreak.java b/common/buildcraft/robots/ai/AIRobotBreak.java index 06966aa2..c6e08c9b 100644 --- a/common/buildcraft/robots/ai/AIRobotBreak.java +++ b/common/buildcraft/robots/ai/AIRobotBreak.java @@ -129,7 +129,7 @@ public class AIRobotBreak extends AIRobot { @Override public int getEnergyCost() { - return 20; + return 30; } @Override diff --git a/common/buildcraft/robots/ai/AIRobotCraftGeneric.java b/common/buildcraft/robots/ai/AIRobotCraftGeneric.java index 11cf82d8..6bd37de3 100755 --- a/common/buildcraft/robots/ai/AIRobotCraftGeneric.java +++ b/common/buildcraft/robots/ai/AIRobotCraftGeneric.java @@ -33,4 +33,9 @@ public abstract class AIRobotCraftGeneric extends AIRobot { return crafted; } + @Override + public int getEnergyCost() { + return 10; + } + } diff --git a/common/buildcraft/robots/ai/AIRobotFetchItem.java b/common/buildcraft/robots/ai/AIRobotFetchItem.java index 6cf9f6e2..e7c3d153 100755 --- a/common/buildcraft/robots/ai/AIRobotFetchItem.java +++ b/common/buildcraft/robots/ai/AIRobotFetchItem.java @@ -155,4 +155,9 @@ public class AIRobotFetchItem extends AIRobot { terminate(); } } + + @Override + public int getEnergyCost() { + return 20; + } } diff --git a/common/buildcraft/robots/ai/AIRobotMain.java b/common/buildcraft/robots/ai/AIRobotMain.java index 4ab9b27d..018e428a 100755 --- a/common/buildcraft/robots/ai/AIRobotMain.java +++ b/common/buildcraft/robots/ai/AIRobotMain.java @@ -22,7 +22,7 @@ public class AIRobotMain extends AIRobot { @Override public void preempt(AIRobot ai) { if (!(ai instanceof AIRobotRecharge)) { - if (robot.getEnergy() < EntityRobotBase.MAX_ENERGY / 4.0) { + if (robot.getEnergy() < EntityRobotBase.SAFETY_ENERGY) { startDelegateAI(new AIRobotRecharge(robot)); } else if (overridingAI != null && ai != overridingAI) { startDelegateAI(overridingAI); diff --git a/common/buildcraft/robots/ai/AIRobotPumpBlock.java b/common/buildcraft/robots/ai/AIRobotPumpBlock.java index 7c541ac9..79f0b442 100644 --- a/common/buildcraft/robots/ai/AIRobotPumpBlock.java +++ b/common/buildcraft/robots/ai/AIRobotPumpBlock.java @@ -68,7 +68,7 @@ public class AIRobotPumpBlock extends AIRobot { @Override public int getEnergyCost() { - return 20; + return 30; } @Override diff --git a/common/buildcraft/robots/ai/AIRobotSearchBlock.java b/common/buildcraft/robots/ai/AIRobotSearchBlock.java index 2a5c67cc..70a78036 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchBlock.java @@ -96,4 +96,10 @@ public class AIRobotSearchBlock extends AIRobot { public void unreserve() { blockScanner.unreserve(blockFound); } + + @Override + public int getEnergyCost() { + return 2; + } + } diff --git a/common/buildcraft/robots/ai/AIRobotSearchEntity.java b/common/buildcraft/robots/ai/AIRobotSearchEntity.java index 9672e0c4..dc8c36ad 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchEntity.java +++ b/common/buildcraft/robots/ai/AIRobotSearchEntity.java @@ -73,4 +73,9 @@ public class AIRobotSearchEntity extends AIRobot { terminate(); } + + @Override + public int getEnergyCost() { + return 2; + } } diff --git a/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java b/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java index 7e3dfb72..fa1c461d 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java @@ -75,4 +75,9 @@ public class AIRobotSearchRandomGroundBlock extends AIRobot { } } } + + @Override + public int getEnergyCost() { + return 2; + } } diff --git a/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java b/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java index 6fae02ab..eb6bfba3 100755 --- a/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java +++ b/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java @@ -70,6 +70,6 @@ public class AIRobotUseToolOnBlock extends AIRobot { @Override public int getEnergyCost() { - return 20; + return 30; } } diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 71edeb7b..98406ce5 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -670,7 +670,6 @@ public class BlockGenericPipe extends BlockBuildCraft { if (robot != null && robot.getRegistry() != null) { robot.setUniqueRobotId(robot.getRegistry().getNextRobotId()); - robot.getBattery().setEnergy(EntityRobotBase.MAX_ENERGY); float px = x + 0.5F + rayTraceResult.sideHit.offsetX * 0.5F; float py = y + 0.5F + rayTraceResult.sideHit.offsetY * 0.5F; From dc2a32fc5af6b1d5ddfd987e4e19bed8e9f0fe2a Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Tue, 17 Feb 2015 09:27:04 -0300 Subject: [PATCH 28/67] fix direction parameters choosing the wrong directions, fix #2454 --- .../buildcraft/core/statements/StatementParameterDirection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/core/statements/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java index 90e91626..ff5e1f28 100644 --- a/common/buildcraft/core/statements/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -51,7 +51,7 @@ public class StatementParameterDirection implements IStatementParameter { if (source.getTile() instanceof TileGenericPipe) { do { direction = ForgeDirection.getOrientation((direction.ordinal() + (mouse.getButton() > 0 ? -1 : 1)) % 6); - } while (((TileGenericPipe) source.getTile()).isPipeConnected(direction)); + } while (!((TileGenericPipe) source.getTile()).isPipeConnected(direction)); } } From 99501d7b034d1bbb418c18c0611a4dd3559212fd Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Tue, 17 Feb 2015 10:06:15 -0300 Subject: [PATCH 29/67] fix style --- common/buildcraft/transport/BlockGenericPipe.java | 1 - common/buildcraft/transport/pipes/PipeItemsStripes.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 98406ce5..5611b6da 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -55,7 +55,6 @@ import buildcraft.api.events.PipePlacedEvent; import buildcraft.api.events.RobotPlacementEvent; import buildcraft.api.gates.GateExpansions; import buildcraft.api.gates.IGateExpansion; -import buildcraft.api.robots.EntityRobotBase; import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipeTile; diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 620aab57..5604a380 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -112,7 +112,7 @@ public class PipeItemsStripes extends Pipe implements IEnerg } } - if(defaultItemsHandler.handle(getWorld(), (int) p.x, (int) p.y, (int) p.z, + if (defaultItemsHandler.handle(getWorld(), (int) p.x, (int) p.y, (int) p.z, event.direction, stack, player, this)) { event.entity = null; } From 0607faf12f6977eda6721ce9557e6a22a59e1b28 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Tue, 17 Feb 2015 15:28:33 -0300 Subject: [PATCH 30/67] fix robots dying while charging when they have 0 energy --- common/buildcraft/robots/EntityRobot.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/robots/EntityRobot.java b/common/buildcraft/robots/EntityRobot.java index 30d3f7bb..c3425888 100644 --- a/common/buildcraft/robots/EntityRobot.java +++ b/common/buildcraft/robots/EntityRobot.java @@ -63,6 +63,7 @@ import buildcraft.core.utils.NBTUtils; import buildcraft.core.utils.Utils; import buildcraft.robots.ai.AIRobotMain; import buildcraft.robots.statements.ActionRobotWorkInArea; +import buildcraft.transport.PipeTransportPower; import buildcraft.transport.gates.ActionIterator; import buildcraft.transport.gates.StatementSlot; @@ -315,7 +316,7 @@ public class EntityRobot extends EntityRobotBase implements needsUpdate = true; } - if (this.battery.getEnergyStored() <= 0) { + if (this.battery.getEnergyStored() <= 0 && !linkedToChargeStation()) { setDead(); } } @@ -324,6 +325,17 @@ public class EntityRobot extends EntityRobotBase implements super.onEntityUpdate(); this.worldObj.theProfiler.endSection(); } + + private boolean linkedToChargeStation() { + if (currentDockingStation == null) { + return false; + } + if (!(currentDockingStation.getPipe().pipe.transport instanceof PipeTransportPower)) { + return false; + } + return true; + } + @SideOnly(Side.CLIENT) private void spawnEnergyFX() { Minecraft.getMinecraft().effectRenderer.addEffect(new EntityRobotEnergyParticle( From adebf197dffd49a2e3bc2d24274f187503781a0d Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Tue, 17 Feb 2015 16:08:47 -0300 Subject: [PATCH 31/67] robot smoke now slowly floats upwards --- common/buildcraft/robots/EntityRobot.java | 2 +- common/buildcraft/robots/EntityRobotEnergyParticle.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/common/buildcraft/robots/EntityRobot.java b/common/buildcraft/robots/EntityRobot.java index c3425888..1215c278 100644 --- a/common/buildcraft/robots/EntityRobot.java +++ b/common/buildcraft/robots/EntityRobot.java @@ -721,7 +721,7 @@ public class EntityRobot extends EntityRobotBase implements }), worldObj); } else { Vec3 v = Vec3.createVectorHelper(x, y, z); - v.normalize(); + v = v.normalize(); steamDx = (int) v.xCoord; steamDy = (int) v.yCoord; diff --git a/common/buildcraft/robots/EntityRobotEnergyParticle.java b/common/buildcraft/robots/EntityRobotEnergyParticle.java index 1ff71d7d..597387e5 100755 --- a/common/buildcraft/robots/EntityRobotEnergyParticle.java +++ b/common/buildcraft/robots/EntityRobotEnergyParticle.java @@ -79,14 +79,8 @@ public class EntityRobotEnergyParticle extends EntityFX { this.setParticleTextureIndex(7 - this.particleAge * 8 / this.particleMaxAge); this.moveEntity(this.motionX, this.motionY, this.motionZ); - if (this.posY == this.prevPosY) { - this.motionX *= 1.1D; - this.motionY = 0.001D; - this.motionZ *= 1.1D; - } - this.motionX *= 0.98; - this.motionY *= 0.98; + this.motionY += 0.0005; this.motionZ *= 0.98; if (this.onGround) { From 6fe8ec37dbdda004aa4e14b783dcf2d066d74772 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Tue, 17 Feb 2015 18:10:26 -0300 Subject: [PATCH 32/67] add a gate action to filter the tools of the robots --- .../assets/buildcraft/lang/en_US.lang | 1 + .../triggers/action_robot_filter_tool.png | Bin 0 -> 301 bytes common/buildcraft/BuildCraftSilicon.java | 3 + .../inventory/filters/AggregateFilter.java | 34 ++++++ .../ai/AIRobotFetchAndEquipItemStack.java | 4 +- .../statements/ActionRobotFilterTool.java | 97 ++++++++++++++++++ .../statements/RobotsActionProvider.java | 1 + 7 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_filter_tool.png create mode 100644 common/buildcraft/core/inventory/filters/AggregateFilter.java create mode 100644 common/buildcraft/robots/statements/ActionRobotFilterTool.java diff --git a/buildcraft_resources/assets/buildcraft/lang/en_US.lang b/buildcraft_resources/assets/buildcraft/lang/en_US.lang index 50f3848c..693cd8d8 100644 --- a/buildcraft_resources/assets/buildcraft/lang/en_US.lang +++ b/buildcraft_resources/assets/buildcraft/lang/en_US.lang @@ -101,6 +101,7 @@ gate.action.robot.work_in_area=Work in Area gate.action.robot.wakeup=Wake Up gate.action.station.forbid_robot=Robot Forbidden gate.action.robot.filter=Filter +gate.action.robot.filter_tool=Filter Tool gate.expansion.fader=Redstone Fader gate.expansion.pulsar=Autarchic Pulsar diff --git a/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_filter_tool.png b/buildcraft_resources/assets/buildcraft/textures/items/triggers/action_robot_filter_tool.png new file mode 100644 index 0000000000000000000000000000000000000000..3695ebcbfdcf25e6471cb828322fc73be3ad9ef5 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!M}SX=E06{P4Gj%bQ`7$p3>Fp^ z&d$yO0RgjT&)&In=fQ&q4<9~!?AWp6$B&;mbLQN+bC)h%x_tTal`B`SUAuPs_U-%k z@4tNc^39t!n)4+Xfd(;_1o;IsI6S+N2I3@nySp%Su*!M>Ih+L^k;M!Q+`=Ht$S`Y; z1W=H@#M9T6{XUbRh!NA$jz~kGP@JcWV~E7%-2T&I4GJ7Cf getGateFilterStacks(IDockingStation station) { + ArrayList result = new ArrayList(); + + for (StatementSlot slot : new ActionIterator(((DockingStation) station).getPipe().pipe)) { + if (slot.statement instanceof ActionRobotFilterTool) { + for (IStatementParameter p : slot.parameters) { + if (p != null && p instanceof StatementParameterItemStack) { + StatementParameterItemStack param = (StatementParameterItemStack) p; + ItemStack stack = param.getItemStack(); + + if (stack != null) { + result.add(stack); + } + } + } + } + } + + return result; + } + + public static IStackFilter getGateFilter(IDockingStation station) { + Collection stacks = getGateFilterStacks(station); + + if (stacks.size() == 0) { + return new PassThroughStackFilter(); + } else { + return new ArrayStackOrListFilter(stacks.toArray(new ItemStack[stacks.size()])); + } + } + + @Override + public void actionActivate(IStatementContainer source, + IStatementParameter[] parameters) { + } +} diff --git a/common/buildcraft/robots/statements/RobotsActionProvider.java b/common/buildcraft/robots/statements/RobotsActionProvider.java index c3a23ebf..1c66aa3c 100755 --- a/common/buildcraft/robots/statements/RobotsActionProvider.java +++ b/common/buildcraft/robots/statements/RobotsActionProvider.java @@ -61,6 +61,7 @@ public class RobotsActionProvider implements IActionProvider { result.add(BuildCraftSilicon.actionRobotWorkInArea); result.add(BuildCraftSilicon.actionRobotWakeUp); result.add(BuildCraftSilicon.actionRobotFilter); + result.add(BuildCraftSilicon.actionRobotFilterTool); result.add(BuildCraftSilicon.actionStationForbidRobot); if (((TileGenericPipe) tile).pipe.transport instanceof PipeTransportItems) { From e9af8230e626e60b9d2db66eaa797c115f59156e Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Wed, 18 Feb 2015 22:25:50 -0300 Subject: [PATCH 33/67] restore the randomness to the planter robot --- common/buildcraft/BuildCraftCore.java | 4 +- .../core/BlockScannerExpanding.java | 75 +++++++++++++ .../buildcraft/core/BlockScannerRandom.java | 48 +++++++++ .../core/BlockScannerZoneRandom.java | 48 +++++++++ common/buildcraft/core/Box.java | 2 +- .../utils/concurrency/PathFindingSearch.java | 102 ++++++------------ .../ai/AIRobotGotoRandomGroundBlock.java | 84 --------------- .../robots/ai/AIRobotSearchBlock.java | 90 +--------------- .../robots/ai/AIRobotSearchBlockBase.java | 98 +++++++++++++++++ .../robots/ai/AIRobotSearchRandomBlock.java | 36 +++++++ .../ai/AIRobotSearchRandomGroundBlock.java | 4 - .../robots/boards/BoardRobotPlanter.java | 20 ++-- 12 files changed, 347 insertions(+), 264 deletions(-) create mode 100644 common/buildcraft/core/BlockScannerExpanding.java create mode 100644 common/buildcraft/core/BlockScannerRandom.java create mode 100644 common/buildcraft/core/BlockScannerZoneRandom.java delete mode 100755 common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java create mode 100644 common/buildcraft/robots/ai/AIRobotSearchBlockBase.java create mode 100755 common/buildcraft/robots/ai/AIRobotSearchRandomBlock.java diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 84636bd7..278289a7 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -140,7 +140,6 @@ import buildcraft.robots.ai.AIRobotFetchItem; import buildcraft.robots.ai.AIRobotGoAndLinkToDock; import buildcraft.robots.ai.AIRobotGoto; import buildcraft.robots.ai.AIRobotGotoBlock; -import buildcraft.robots.ai.AIRobotGotoRandomGroundBlock; import buildcraft.robots.ai.AIRobotGotoSleep; import buildcraft.robots.ai.AIRobotGotoStation; import buildcraft.robots.ai.AIRobotGotoStationAndLoad; @@ -158,6 +157,7 @@ import buildcraft.robots.ai.AIRobotRecharge; import buildcraft.robots.ai.AIRobotSearchAndGotoStation; import buildcraft.robots.ai.AIRobotSearchBlock; import buildcraft.robots.ai.AIRobotSearchEntity; +import buildcraft.robots.ai.AIRobotSearchRandomBlock; import buildcraft.robots.ai.AIRobotSearchRandomGroundBlock; import buildcraft.robots.ai.AIRobotSearchStackRequest; import buildcraft.robots.ai.AIRobotSearchStation; @@ -444,7 +444,6 @@ public class BuildCraftCore extends BuildCraftMod { RobotManager.registerAIRobot(AIRobotGoAndLinkToDock.class, "aiRobotGoAndLinkToDock", "buildcraft.core.robots.AIRobotGoAndLinkToDock"); RobotManager.registerAIRobot(AIRobotGoto.class, "aiRobotGoto", "buildcraft.core.robots.AIRobotGoto"); RobotManager.registerAIRobot(AIRobotGotoBlock.class, "aiRobotGotoBlock", "buildcraft.core.robots.AIRobotGotoBlock"); - RobotManager.registerAIRobot(AIRobotGotoRandomGroundBlock.class, "aiRobotGotoRandomGroundBlock", "buildcraft.core.robots.AIRobotGotoRandomGroundBlock"); RobotManager.registerAIRobot(AIRobotGotoSleep.class, "aiRobotGotoSleep", "buildcraft.core.robots.AIRobotGotoSleep"); RobotManager.registerAIRobot(AIRobotGotoStation.class, "aiRobotGotoStation", "buildcraft.core.robots.AIRobotGotoStation"); RobotManager.registerAIRobot(AIRobotGotoStationAndLoad.class, "aiRobotGotoStationAndLoad", "buildcraft.core.robots.AIRobotGotoStationAndLoad"); @@ -461,6 +460,7 @@ public class BuildCraftCore extends BuildCraftMod { RobotManager.registerAIRobot(AIRobotSearchAndGotoStation.class, "aiRobotSearchAndGotoStation", "buildcraft.core.robots.AIRobotSearchAndGotoStation"); RobotManager.registerAIRobot(AIRobotSearchBlock.class, "aiRobotSearchBlock", "buildcraft.core.robots.AIRobotSearchBlock"); RobotManager.registerAIRobot(AIRobotSearchEntity.class, "aiRobotSearchEntity", "buildcraft.core.robots.AIRobotSearchEntity"); + RobotManager.registerAIRobot(AIRobotSearchRandomBlock.class, "aiRobotSearchRandomBlock", "buildcraft.core.robots.AIRobotSearchRandomBlock"); RobotManager.registerAIRobot(AIRobotSearchRandomGroundBlock.class, "aiRobotSearchRandomGroundBlock", "buildcraft.core.robots.AIRobotSearchRandomGroundBlock"); RobotManager.registerAIRobot(AIRobotSearchStackRequest.class, "aiRobotSearchStackRequest", "buildcraft.core.robots.AIRobotSearchStackRequest"); RobotManager.registerAIRobot(AIRobotSearchStation.class, "aiRobotSearchStation", "buildcraft.core.robots.AIRobotSearchStation"); diff --git a/common/buildcraft/core/BlockScannerExpanding.java b/common/buildcraft/core/BlockScannerExpanding.java new file mode 100644 index 00000000..479a9f66 --- /dev/null +++ b/common/buildcraft/core/BlockScannerExpanding.java @@ -0,0 +1,75 @@ +package buildcraft.core; + +import java.util.Iterator; + +import buildcraft.api.core.BlockIndex; +import buildcraft.core.BlockScanner.BlockIt; + +public class BlockScannerExpanding implements Iterable { + + private int searchRadius; + private int searchX; + private int searchY; + private int searchZ; + + class BlockIt implements Iterator { + + @Override + public boolean hasNext() { + return searchRadius < 64; + } + + @Override + public BlockIndex next() { + // Step through each block in a hollow cube of size (searchRadius * 2 -1), if done + // add 1 to the radius and start over. + + BlockIndex next = new BlockIndex(searchX, searchY, searchZ); + + // Step to the next Y + if (Math.abs(searchX) == searchRadius || Math.abs(searchZ) == searchRadius) { + searchY += 1; + } else { + searchY += searchRadius * 2; + } + + if (searchY > searchRadius) { + // Step to the next Z + searchY = -searchRadius; + searchZ += 1; + + if (searchZ > searchRadius) { + // Step to the next X + searchZ = -searchRadius; + searchX += 1; + + if (searchX > searchRadius) { + // Step to the next radius + searchRadius += 1; + searchX = -searchRadius; + searchY = -searchRadius; + searchZ = -searchRadius; + } + } + } + return next; + } + + @Override + public void remove() { + } + } + + public BlockScannerExpanding() { + searchRadius = 1; + searchX = -1; + searchY = -1; + searchZ = -1; + } + + @Override + public Iterator iterator() { + return new BlockIt(); + } + +} diff --git a/common/buildcraft/core/BlockScannerRandom.java b/common/buildcraft/core/BlockScannerRandom.java new file mode 100644 index 00000000..1e67c3bf --- /dev/null +++ b/common/buildcraft/core/BlockScannerRandom.java @@ -0,0 +1,48 @@ +package buildcraft.core; + +import java.util.Iterator; +import java.util.Random; + +import buildcraft.api.core.BlockIndex; + +public class BlockScannerRandom implements Iterable { + + private Random rand; + private int maxDistance; + + class BlockIt implements Iterator { + + @Override + public boolean hasNext() { + return true; + } + + @Override + public BlockIndex next() { + double radius = rand.nextFloat() * maxDistance; + double polarAngle = rand.nextFloat() * 2.0 * Math.PI; + double azimuthAngle = rand.nextFloat() * Math.PI; + + int searchX = (int) (radius * Math.cos(polarAngle) * Math.sin(azimuthAngle)); + int searchY = (int) (radius * Math.cos(azimuthAngle)); + int searchZ = (int) (radius * Math.sin(polarAngle) * Math.sin(azimuthAngle)); + + return new BlockIndex(searchX, searchY, searchZ); + } + + @Override + public void remove() { + } + } + + public BlockScannerRandom(Random iRand, int iMaxDistance) { + rand = iRand; + maxDistance = iMaxDistance; + } + + @Override + public Iterator iterator() { + return new BlockIt(); + } + +} diff --git a/common/buildcraft/core/BlockScannerZoneRandom.java b/common/buildcraft/core/BlockScannerZoneRandom.java new file mode 100644 index 00000000..81639895 --- /dev/null +++ b/common/buildcraft/core/BlockScannerZoneRandom.java @@ -0,0 +1,48 @@ +package buildcraft.core; + +import java.util.Iterator; +import java.util.Random; + +import buildcraft.api.core.BlockIndex; +import buildcraft.api.core.IZone; + +public class BlockScannerZoneRandom implements Iterable { + + private Random rand; + private IZone zone; + private int x; + private int y; + private int z; + + class BlockIt implements Iterator { + + @Override + public boolean hasNext() { + return true; + } + + @Override + public BlockIndex next() { + BlockIndex block = zone.getRandomBlockIndex(rand); + return new BlockIndex(block.x - x, block.y - y, block.z - z); + } + + @Override + public void remove() { + } + } + + public BlockScannerZoneRandom(int iX, int iY, int iZ, Random iRand, IZone iZone) { + x = iX; + y = iY; + z = iZ; + rand = iRand; + zone = iZone; + } + + @Override + public Iterator iterator() { + return new BlockIt(); + } + +} diff --git a/common/buildcraft/core/Box.java b/common/buildcraft/core/Box.java index aca217ac..690afe38 100644 --- a/common/buildcraft/core/Box.java +++ b/common/buildcraft/core/Box.java @@ -364,7 +364,7 @@ public class Box implements IBox, ISerializable { @Override public BlockIndex getRandomBlockIndex(Random rand) { int x = xMin + rand.nextInt(xMax - xMin); - int y = yMin + rand.nextInt(yMax - yMin); + int y = (yMax > yMin) ? yMin + rand.nextInt(yMax - yMin) : yMin; int z = zMin + rand.nextInt(zMax - zMin); return new BlockIndex(x, y, z); diff --git a/common/buildcraft/core/utils/concurrency/PathFindingSearch.java b/common/buildcraft/core/utils/concurrency/PathFindingSearch.java index f4b0626d..dec6e209 100644 --- a/common/buildcraft/core/utils/concurrency/PathFindingSearch.java +++ b/common/buildcraft/core/utils/concurrency/PathFindingSearch.java @@ -11,6 +11,7 @@ package buildcraft.core.utils.concurrency; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -33,32 +34,25 @@ public class PathFindingSearch implements IIterableAlgorithm { private IBlockFilter pathFound; private IZone zone; private float maxDistance; + private Iterator blockIter; - private int searchRadius; - private int searchX; - private int searchY; - private int searchZ; - private int searchHeight; - - - public PathFindingSearch(World iWorld, BlockIndex iStart, IBlockFilter iPathFound, float iMaxDistance, IZone iZone) { + public PathFindingSearch(World iWorld, BlockIndex iStart, + Iterator iBlockIter, IBlockFilter iPathFound, + float iMaxDistance, IZone iZone) { world = iWorld; start = iStart; pathFound = iPathFound; maxDistance = iMaxDistance; + zone = iZone; + blockIter = iBlockIter; pathFinders = new LinkedList(); - searchRadius = 1; - searchX = -1; - searchY = -1; - searchZ = -1; - getSearchHeight(start.x + searchX, start.z + searchZ); } @Override public void iterate() { - if (pathFinders.size() < 5 && searchRadius < 64) { + if (pathFinders.size() < 5 && blockIter.hasNext()) { iterateSearch(PATH_ITERATIONS * 50); } iteratePathFind(PATH_ITERATIONS); @@ -66,16 +60,17 @@ public class PathFindingSearch implements IIterableAlgorithm { private void iterateSearch(int itNumber) { for (int i = 0; i < itNumber; ++i) { - int currX = start.x + searchX; - int currY = start.y + searchY; - int currZ = start.z + searchZ; - if (0 <= currY && currY <= searchHeight) { - if (isTarget(currX, currY, currZ)) { - pathFinders.add(new PathFinding(world, start, new BlockIndex(currX, currY, currZ), 0, maxDistance)); - } + if (!blockIter.hasNext()) { + return; } - nextSearchStep(); + BlockIndex delta = blockIter.next(); + BlockIndex block = new BlockIndex(start.x + delta.x, start.y + delta.y, start.z + delta.z); + if (isLoadedChunk(block.x, block.z)) { + if (isTarget(block)) { + pathFinders.add(new PathFinding(world, start, block, 0, maxDistance)); + } + } if (pathFinders.size() >= 5) { return; @@ -83,72 +78,35 @@ public class PathFindingSearch implements IIterableAlgorithm { } } - private void nextSearchStep() { - // Step through each block in a hollow cube of size (searchRadius * 2 -1), if done - // add 1 to the radius and start over. - - // Step to the next Y - if (Math.abs(searchX) == searchRadius || Math.abs(searchZ) == searchRadius) { - searchY += 1; - } else { - searchY += searchRadius * 2; - } - - if (searchY > searchRadius) { - // Step to the next Z - searchY = -searchRadius; - searchZ += 1; - - if (searchZ > searchRadius) { - // Step to the next X - searchZ = -searchRadius; - searchX += 1; - - if (searchX > searchRadius) { - // Step to the next radius - searchRadius += 1; - searchX = -searchRadius; - searchY = -searchRadius; - searchZ = -searchRadius; - } - } - searchHeight = getSearchHeight(start.x + searchX, start.z + searchZ); - } - } - - private boolean isTarget(int x, int y, int z) { - if (zone != null && !zone.contains(x, y, z)) { + private boolean isTarget(BlockIndex block) { + if (zone != null && !zone.contains(block.x, block.y, block.z)) { return false; } - if (!pathFound.matches(world, x, y, z)) { + if (!pathFound.matches(world, block.x, block.y, block.z)) { return false; } synchronized (reservations) { if (reservations.containsKey(world.provider.dimensionId)) { HashSet dimReservations = reservations .get(world.provider.dimensionId); - if (dimReservations.contains(new BlockIndex(x, y, z))) { + if (dimReservations.contains(block)) { return false; } } } - if (!BuildCraftAPI.isSoftBlock(world, x - 1, y, z) - && !BuildCraftAPI.isSoftBlock(world, x + 1, y, z) - && !BuildCraftAPI.isSoftBlock(world, x, y, z - 1) - && !BuildCraftAPI.isSoftBlock(world, x, y, z + 1) - && !BuildCraftAPI.isSoftBlock(world, x, y - 1, z) - && !BuildCraftAPI.isSoftBlock(world, x, y + 1, z)) { + if (!BuildCraftAPI.isSoftBlock(world, block.x - 1, block.y, block.z) + && !BuildCraftAPI.isSoftBlock(world, block.x + 1, block.y, block.z) + && !BuildCraftAPI.isSoftBlock(world, block.x, block.y, block.z - 1) + && !BuildCraftAPI.isSoftBlock(world, block.x, block.y, block.z + 1) + && !BuildCraftAPI.isSoftBlock(world, block.x, block.y - 1, block.z) + && !BuildCraftAPI.isSoftBlock(world, block.x, block.y + 1, block.z)) { return false; } return true; } - private int getSearchHeight(int x, int z) { - if (world.getChunkProvider().chunkExists(x >> 4, z >> 4)) { - return 256; - } else { - return -1; - } + private boolean isLoadedChunk(int x, int z) { + return world.getChunkProvider().chunkExists(x >> 4, z >> 4); } public void iteratePathFind(int itNumber) { @@ -173,7 +131,7 @@ public class PathFindingSearch implements IIterableAlgorithm { return true; } } - return searchRadius >= 64; + return !blockIter.hasNext(); } public LinkedList getResult() { diff --git a/common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java b/common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java deleted file mode 100755 index e8f69530..00000000 --- a/common/buildcraft/robots/ai/AIRobotGotoRandomGroundBlock.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.robots.ai; - -import java.util.LinkedList; - -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.concurrency.IterableAlgorithmRunner; -import buildcraft.core.utils.concurrency.PathFinding; - -public class AIRobotGotoRandomGroundBlock extends AIRobot { - - public BlockIndex blockFound; - - private int range; - private PathFinding pathFinding; - private IterableAlgorithmRunner pathFindingJob; - private IBlockFilter filter; - private IZone zone; - - public AIRobotGotoRandomGroundBlock(EntityRobotBase iRobot) { - super(iRobot); - } - - public AIRobotGotoRandomGroundBlock(EntityRobotBase iRobot, int iRange, IBlockFilter iFilter, IZone iZone) { - super(iRobot); - - range = iRange; - filter = iFilter; - zone = iZone; - } - - @Override - public void update() { - if (pathFindingJob == null) { - startDelegateAI(new AIRobotSearchRandomGroundBlock(robot, range, filter, zone)); - } else { - if (!pathFindingJob.isAlive()) { - LinkedList path = pathFinding.getResult(); - if (path.size() == 0) { - terminate(); - } else { - path.removeLast(); - startDelegateAI(new AIRobotGotoBlock(robot, path)); - } - } - } - } - - @Override - public void delegateAIEnded(AIRobot ai) { - if (ai instanceof AIRobotSearchRandomGroundBlock) { - AIRobotSearchRandomGroundBlock aiFind = (AIRobotSearchRandomGroundBlock) ai; - - if (aiFind.blockFound == null) { - terminate(); - } - - blockFound = aiFind.blockFound; - pathFinding = new PathFinding(robot.worldObj, new BlockIndex(robot), blockFound); - pathFindingJob = new IterableAlgorithmRunner(pathFinding); - pathFindingJob.start(); - } else if (ai instanceof AIRobotGotoBlock) { - terminate(); - } - } - - @Override - public void end() { - if (pathFindingJob != null) { - pathFindingJob.terminate(); - } - } -} diff --git a/common/buildcraft/robots/ai/AIRobotSearchBlock.java b/common/buildcraft/robots/ai/AIRobotSearchBlock.java index 70a78036..78f5d7f4 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchBlock.java @@ -8,98 +8,14 @@ */ package buildcraft.robots.ai; -import java.util.LinkedList; - -import net.minecraft.nbt.NBTTagCompound; - -import buildcraft.api.core.BlockIndex; -import buildcraft.api.robots.AIRobot; import buildcraft.api.robots.EntityRobotBase; +import buildcraft.core.BlockScannerExpanding; import buildcraft.core.utils.IBlockFilter; -import buildcraft.core.utils.concurrency.IterableAlgorithmRunner; -import buildcraft.core.utils.concurrency.PathFindingSearch; -public class AIRobotSearchBlock extends AIRobot { - - public BlockIndex blockFound; - public LinkedList path; - private PathFindingSearch blockScanner = null; - private IterableAlgorithmRunner blockScannerJob; - private IBlockFilter pathFound; - - public AIRobotSearchBlock(EntityRobotBase iRobot) { - super(iRobot); - } +public class AIRobotSearchBlock extends AIRobotSearchBlockBase { public AIRobotSearchBlock(EntityRobotBase iRobot, IBlockFilter iPathFound) { - super(iRobot); - - pathFound = iPathFound; - } - - @Override - public void start() { - blockScanner = new PathFindingSearch(robot.worldObj, new BlockIndex(robot), pathFound, 96, robot.getZoneToWork()); - blockScannerJob = new IterableAlgorithmRunner(blockScanner, 40000); - blockScannerJob.start(); - } - - @Override - public void update() { - if (blockScannerJob == null) { - // This is probably due to a load from NBT. Abort the ai in - // that case, since there's no filter to analyze either. - abort(); - return; - } - - if (blockScannerJob.isDone()) { - path = blockScanner.getResult(); - - if (path != null && path.size() > 0) { - blockFound = path.removeLast(); - } else { - path = null; - } - - terminate(); - } - } - - @Override - public void end() { - if (blockScannerJob != null) { - blockScannerJob.terminate(); - } - } - - @Override - public void writeSelfToNBT(NBTTagCompound nbt) { - super.writeSelfToNBT(nbt); - - if (blockFound != null) { - NBTTagCompound sub = new NBTTagCompound(); - blockFound.writeTo(sub); - nbt.setTag("blockFound", sub); - } - } - - @Override - public void loadSelfFromNBT(NBTTagCompound nbt) { - super.loadSelfFromNBT(nbt); - - if (nbt.hasKey("blockFound")) { - blockFound = new BlockIndex(nbt.getCompoundTag("blockFound")); - } - } - - public void unreserve() { - blockScanner.unreserve(blockFound); - } - - @Override - public int getEnergyCost() { - return 2; + super(iRobot, iPathFound, new BlockScannerExpanding().iterator()); } } diff --git a/common/buildcraft/robots/ai/AIRobotSearchBlockBase.java b/common/buildcraft/robots/ai/AIRobotSearchBlockBase.java new file mode 100644 index 00000000..f65a5023 --- /dev/null +++ b/common/buildcraft/robots/ai/AIRobotSearchBlockBase.java @@ -0,0 +1,98 @@ +package buildcraft.robots.ai; + +import java.util.Iterator; +import java.util.LinkedList; + +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.concurrency.IterableAlgorithmRunner; +import buildcraft.core.utils.concurrency.PathFindingSearch; + +public class AIRobotSearchBlockBase extends AIRobot { + + public BlockIndex blockFound; + public LinkedList path; + private PathFindingSearch blockScanner = null; + private IterableAlgorithmRunner blockScannerJob; + private IBlockFilter pathFound; + private Iterator blockIter; + + public AIRobotSearchBlockBase(EntityRobotBase iRobot, IBlockFilter iPathFound, Iterator iBlockIter) { + super(iRobot); + + pathFound = iPathFound; + blockIter = iBlockIter; + } + + @Override + public void start() { + blockScanner = new PathFindingSearch(robot.worldObj, new BlockIndex( + robot), blockIter, pathFound, 96, robot + .getZoneToWork()); + blockScannerJob = new IterableAlgorithmRunner(blockScanner, 40000); + blockScannerJob.start(); + } + + @Override + public void update() { + if (blockScannerJob == null) { + // This is probably due to a load from NBT. Abort the ai in + // that case, since there's no filter to analyze either. + abort(); + return; + } + + if (blockScannerJob.isDone()) { + path = blockScanner.getResult(); + + if (path != null && path.size() > 0) { + blockFound = path.removeLast(); + } else { + path = null; + } + + terminate(); + } + } + + @Override + public void end() { + if (blockScannerJob != null) { + blockScannerJob.terminate(); + } + } + + @Override + public void writeSelfToNBT(NBTTagCompound nbt) { + super.writeSelfToNBT(nbt); + + if (blockFound != null) { + NBTTagCompound sub = new NBTTagCompound(); + blockFound.writeTo(sub); + nbt.setTag("blockFound", sub); + } + } + + @Override + public void loadSelfFromNBT(NBTTagCompound nbt) { + super.loadSelfFromNBT(nbt); + + if (nbt.hasKey("blockFound")) { + blockFound = new BlockIndex(nbt.getCompoundTag("blockFound")); + } + } + + public void unreserve() { + blockScanner.unreserve(blockFound); + } + + @Override + public int getEnergyCost() { + return 2; + } + +} \ No newline at end of file diff --git a/common/buildcraft/robots/ai/AIRobotSearchRandomBlock.java b/common/buildcraft/robots/ai/AIRobotSearchRandomBlock.java new file mode 100755 index 00000000..9c551efc --- /dev/null +++ b/common/buildcraft/robots/ai/AIRobotSearchRandomBlock.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.robots.ai; + +import java.util.Iterator; + +import buildcraft.api.core.BlockIndex; +import buildcraft.api.core.IZone; +import buildcraft.api.robots.EntityRobotBase; +import buildcraft.core.BlockScannerRandom; +import buildcraft.core.BlockScannerZoneRandom; +import buildcraft.core.utils.IBlockFilter; + +public class AIRobotSearchRandomBlock extends AIRobotSearchBlockBase { + + public AIRobotSearchRandomBlock(EntityRobotBase iRobot, IBlockFilter iPathFound) { + super(iRobot, iPathFound, getBlockIterator(iRobot)); + } + + private static Iterator getBlockIterator(EntityRobotBase iRobot) { + IZone zone = iRobot.getZoneToWork(); + if (zone != null) { + BlockIndex pos = new BlockIndex(iRobot); + return new BlockScannerZoneRandom(pos.x, pos.y, pos.z, iRobot.worldObj.rand, zone).iterator(); + } else { + return new BlockScannerRandom(iRobot.worldObj.rand, 64).iterator(); + } + } + +} diff --git a/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java b/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java index fa1c461d..22a1a197 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java @@ -25,10 +25,6 @@ public class AIRobotSearchRandomGroundBlock extends AIRobot { private IZone zone; private int attempts = 0; - public AIRobotSearchRandomGroundBlock(EntityRobotBase iRobot) { - super(iRobot); - } - public AIRobotSearchRandomGroundBlock(EntityRobotBase iRobot, int iRange, IBlockFilter iFilter, IZone iZone) { super(iRobot); diff --git a/common/buildcraft/robots/boards/BoardRobotPlanter.java b/common/buildcraft/robots/boards/BoardRobotPlanter.java index c7db83a2..4f2cf4e9 100644 --- a/common/buildcraft/robots/boards/BoardRobotPlanter.java +++ b/common/buildcraft/robots/boards/BoardRobotPlanter.java @@ -35,9 +35,9 @@ import buildcraft.core.utils.IBlockFilter; import buildcraft.robots.ResourceIdBlock; 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.AIRobotSearchBlockBase; +import buildcraft.robots.ai.AIRobotSearchRandomBlock; import buildcraft.robots.ai.AIRobotUseToolOnBlock; import buildcraft.robots.statements.ActionRobotFilter; @@ -115,22 +115,14 @@ public class BoardRobotPlanter extends RedstoneBoardRobot { } }; } - startDelegateAI(new AIRobotSearchBlock(robot, blockFilter)); + startDelegateAI(new AIRobotSearchRandomBlock(robot, blockFilter)); } } @Override public void delegateAIEnded(AIRobot ai) { - if (ai instanceof AIRobotGotoRandomGroundBlock) { - AIRobotGotoRandomGroundBlock gotoBlock = (AIRobotGotoRandomGroundBlock) ai; - - if (gotoBlock.blockFound == null) { - startDelegateAI(new AIRobotGotoSleep(robot)); - } else { - startDelegateAI(new AIRobotUseToolOnBlock(robot, gotoBlock.blockFound)); - } - } else if (ai instanceof AIRobotSearchBlock) { - AIRobotSearchBlock gotoBlock = (AIRobotSearchBlock) ai; + if (ai instanceof AIRobotSearchRandomBlock) { + AIRobotSearchBlockBase gotoBlock = (AIRobotSearchBlockBase) ai; if (gotoBlock.blockFound != null && robot.getRegistry().take(new ResourceIdBlock(gotoBlock.blockFound), robot)) { @@ -139,7 +131,7 @@ public class BoardRobotPlanter extends RedstoneBoardRobot { robot.getRegistry().release(new ResourceIdBlock(blockFound)); } - ((AIRobotSearchBlock) ai).unreserve(); + gotoBlock.unreserve(); blockFound = gotoBlock.blockFound; gotoBlock.path.removeLast(); From 09b004e790bc297e9d77f5feb2867c24e080aca2 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Thu, 19 Feb 2015 21:10:11 -0300 Subject: [PATCH 34/67] add a stripes robot --- .../api/transport/IStripesActivator.java | 18 +++ .../api/transport/IStripesHandler.java | 2 +- .../api/transport/IStripesPipe.java | 8 +- .../assets/buildcraft/lang/en_US.lang | 1 + .../textures/entities/robot_stripes.png | Bin 0 -> 896 bytes common/buildcraft/BuildCraftCore.java | 2 + common/buildcraft/BuildCraftSilicon.java | 2 + common/buildcraft/core/Box.java | 4 +- common/buildcraft/core/ItemMapLocation.java | 16 +++ common/buildcraft/robots/EntityRobot.java | 12 ++ .../robots/ai/AIRobotStripesHandler.java | 114 ++++++++++++++++ .../robots/boards/BoardRobotStripes.java | 129 ++++++++++++++++++ .../robots/boards/BoardRobotStripesNBT.java | 64 +++++++++ .../transport/pipes/PipeItemsStripes.java | 2 +- .../stripes/StripesHandlerArrow.java | 6 +- .../stripes/StripesHandlerBucket.java | 12 +- .../stripes/StripesHandlerDefault.java | 6 +- .../stripes/StripesHandlerEntityInteract.java | 12 +- .../stripes/StripesHandlerPipes.java | 4 +- .../stripes/StripesHandlerPlaceBlock.java | 4 +- .../stripes/StripesHandlerRightClick.java | 6 +- .../stripes/StripesHandlerShears.java | 8 +- 22 files changed, 392 insertions(+), 40 deletions(-) create mode 100644 api/buildcraft/api/transport/IStripesActivator.java create mode 100644 buildcraft_resources/assets/buildcraft/textures/entities/robot_stripes.png create mode 100644 common/buildcraft/robots/ai/AIRobotStripesHandler.java create mode 100644 common/buildcraft/robots/boards/BoardRobotStripes.java create mode 100644 common/buildcraft/robots/boards/BoardRobotStripesNBT.java diff --git a/api/buildcraft/api/transport/IStripesActivator.java b/api/buildcraft/api/transport/IStripesActivator.java new file mode 100644 index 00000000..849e0316 --- /dev/null +++ b/api/buildcraft/api/transport/IStripesActivator.java @@ -0,0 +1,18 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. + */ +package buildcraft.api.transport; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.common.util.ForgeDirection; + +public interface IStripesActivator { + void sendItem(ItemStack itemStack, ForgeDirection direction); + void dropItem(ItemStack itemStack, ForgeDirection direction); +} diff --git a/api/buildcraft/api/transport/IStripesHandler.java b/api/buildcraft/api/transport/IStripesHandler.java index a2610ee4..f84017e0 100644 --- a/api/buildcraft/api/transport/IStripesHandler.java +++ b/api/buildcraft/api/transport/IStripesHandler.java @@ -25,5 +25,5 @@ public interface IStripesHandler { boolean shouldHandle(ItemStack stack); boolean handle(World world, int x, int y, int z, ForgeDirection direction, - ItemStack stack, EntityPlayer player, IStripesPipe pipe); + ItemStack stack, EntityPlayer player, IStripesActivator activator); } diff --git a/api/buildcraft/api/transport/IStripesPipe.java b/api/buildcraft/api/transport/IStripesPipe.java index da8b2291..ec5a6d47 100644 --- a/api/buildcraft/api/transport/IStripesPipe.java +++ b/api/buildcraft/api/transport/IStripesPipe.java @@ -8,11 +8,5 @@ */ package buildcraft.api.transport; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IStripesPipe extends IPipe { - void sendItem(ItemStack itemStack, ForgeDirection direction); - void dropItem(ItemStack itemStack, ForgeDirection direction); +public interface IStripesPipe extends IPipe, IStripesActivator { } diff --git a/buildcraft_resources/assets/buildcraft/lang/en_US.lang b/buildcraft_resources/assets/buildcraft/lang/en_US.lang index 693cd8d8..24ce8f02 100644 --- a/buildcraft_resources/assets/buildcraft/lang/en_US.lang +++ b/buildcraft_resources/assets/buildcraft/lang/en_US.lang @@ -17,6 +17,7 @@ buildcraft.boardRobotBuilder=Builder buildcraft.boardRobotCrafter=Crafter buildcraft.boardRobotDelivery=Delivery buildcraft.boardRobotPump=Pump +buildcraft.boardRobotStripes=Stripes chat.gateCopier.clear=Gate information cleared. chat.gateCopier.gateCopied=Copied gate information to copier. diff --git a/buildcraft_resources/assets/buildcraft/textures/entities/robot_stripes.png b/buildcraft_resources/assets/buildcraft/textures/entities/robot_stripes.png new file mode 100644 index 0000000000000000000000000000000000000000..016535237665117d7f2802440dc874ed0b6403b9 GIT binary patch literal 896 zcmWlXeN2;A6vodz_rCptCT?Yxua~~iDk#%+vqCnf1J**DF+w^QadDYLLLv%9-hR-+ z0^47jxFu%HwaB1UOQz8om(92j4LZ!Cb_|6Lu^?y*EwW_>mAJ)(y(GW$-19ui`RAT< zsJf~`t;$pZfZAp?+oiWeDnUUd{o>8f&I6E{>dNhw-!7#~Ne93(KxJhmZ9v?Q(1_Rw zq>*A1fCJG1#6h7MpqViTWe$cby__}^RTCu#2t7cc1)+su3(^(>BFLpgL==IDl!zP^ z2{?g?08ZpYf?|rY1!W>KCvc(yT|itETr%R~sEaZe5;p-ilQ|VK7jQ0$ZYklEPNZ&v zZU!D?ZUhe_9*%Q!#3P4RhOMY_18pVXm6U=PSu28r~1@yVHF+kmuj zN-qcPOzEStHdM6{?10n`6#UtOKPRhOCj_#yj%DQ>%j0`_zE>xFW#IdGT_2yjWbt2<#sAD~c_?x3^~KoM#n`q-@i!hz%$7WvD_u%Rl>Iwz{%^q& z(Cb!73nor`)jLo!ce{SY)V@_=hJze$m5j34x>MRqie{w>gWPF*+ajMvjmo5+ zo(zvmGZ{8>>2~X{dve#nqo&L2x1)Vz|IgKaJ zp7t9v%*Pj%StBFYBB}Ndrqum6pE9-oUD-|J_w~>F%M%(?@ZvdL-So3Vn+85k7CE<- z(kp49GgmK+Mb^|k+sev%(uTSwo__kBIjr6gK74q#y+)Zi7+d}I^}U73y%9(3RD&ba xP#3QKJFGvO`QY-#!o2<3L8GetazQ$0M%dM0AN(QObzk~7uvx0i-<0kCdGN=Fm literal 0 HcmV?d00001 diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 278289a7..74b99f8c 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -183,6 +183,7 @@ import buildcraft.robots.boards.BoardRobotPicker; import buildcraft.robots.boards.BoardRobotPlanter; import buildcraft.robots.boards.BoardRobotPump; import buildcraft.robots.boards.BoardRobotShovelman; +import buildcraft.robots.boards.BoardRobotStripes; @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.10,1.8)", dependencies = "required-after:Forge@[10.13.0.1207,)") public class BuildCraftCore extends BuildCraftMod { @@ -432,6 +433,7 @@ public class BuildCraftCore extends BuildCraftMod { RobotManager.registerAIRobot(BoardRobotPlanter.class, "boardRobotPlanter", "buildcraft.core.robots.boards.BoardRobotPlanter"); RobotManager.registerAIRobot(BoardRobotPump.class, "boardRobotPump", "buildcraft.core.robots.boards.BoardRobotPump"); RobotManager.registerAIRobot(BoardRobotShovelman.class, "boardRobotShovelman", "buildcraft.core.robots.boards.BoardRobotShovelman"); + RobotManager.registerAIRobot(BoardRobotStripes.class, "boardRobotStripes", "buildcraft.core.robots.boards.BoardRobotStripes"); RobotManager.registerAIRobot(AIRobotAttack.class, "aiRobotAttack", "buildcraft.core.robots.AIRobotAttack"); RobotManager.registerAIRobot(AIRobotBreak.class, "aiRobotBreak", "buildcraft.core.robots.AIRobotBreak"); RobotManager.registerAIRobot(AIRobotCraftAssemblyTable.class, "aiRobotCraftAssemblyTable", "buildcraft.core.robots.AIRobotCraftAssemblyTable"); diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 7220402d..84f80499 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -65,6 +65,7 @@ import buildcraft.robots.boards.BoardRobotPickerNBT; import buildcraft.robots.boards.BoardRobotPlanterNBT; import buildcraft.robots.boards.BoardRobotPumpNBT; import buildcraft.robots.boards.BoardRobotShovelmanNBT; +import buildcraft.robots.boards.BoardRobotStripesNBT; import buildcraft.robots.statements.ActionRobotFilter; import buildcraft.robots.statements.ActionRobotFilterTool; import buildcraft.robots.statements.ActionRobotGotoStation; @@ -197,6 +198,7 @@ public class BuildCraftSilicon extends BuildCraftMod { RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotBomberNBT.instance, 1); RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotBuilderNBT.instance, 0.5F); + RedstoneBoardRegistry.instance.registerBoardClass(BoardRobotStripesNBT.instance, 0.5F); StatementManager.registerActionProvider(new RobotsActionProvider()); StatementManager.registerTriggerProvider(new RobotsTriggerProvider()); diff --git a/common/buildcraft/core/Box.java b/common/buildcraft/core/Box.java index 690afe38..ec8f8256 100644 --- a/common/buildcraft/core/Box.java +++ b/common/buildcraft/core/Box.java @@ -363,9 +363,9 @@ public class Box implements IBox, ISerializable { @Override public BlockIndex getRandomBlockIndex(Random rand) { - int x = xMin + rand.nextInt(xMax - xMin); + int x = (xMax > xMin) ? xMin + rand.nextInt(xMax - xMin) : xMin; int y = (yMax > yMin) ? yMin + rand.nextInt(yMax - yMin) : yMin; - int z = zMin + rand.nextInt(zMax - zMin); + int z = (zMax > zMin) ? zMin + rand.nextInt(zMax - zMin) : zMin; return new BlockIndex(x, y, z); diff --git a/common/buildcraft/core/ItemMapLocation.java b/common/buildcraft/core/ItemMapLocation.java index b4fcc227..2f72b469 100755 --- a/common/buildcraft/core/ItemMapLocation.java +++ b/common/buildcraft/core/ItemMapLocation.java @@ -212,6 +212,20 @@ public class ItemMapLocation extends ItemBuildCraft { } } + public static IBox getPointBox(ItemStack item) { + NBTTagCompound cpt = NBTUtils.getItemData(item); + + if (cpt.hasKey("kind") && cpt.getByte("kind") == 0) { + int x = cpt.getInteger("x"); + int y = cpt.getInteger("y"); + int z = cpt.getInteger("z"); + + return new Box(x, y, z, x, y, z); + } else { + return null; + } + } + public static ForgeDirection getSide(ItemStack item) { NBTTagCompound cpt = NBTUtils.getItemData(item); @@ -232,6 +246,8 @@ public class ItemMapLocation extends ItemBuildCraft { return plan; } else if (cpt.hasKey("kind") && cpt.getByte("kind") == 1) { return getBox(item); + } else if (cpt.hasKey("kind") && cpt.getByte("kind") == 0) { + return getPointBox(item); } else { return null; } diff --git a/common/buildcraft/robots/EntityRobot.java b/common/buildcraft/robots/EntityRobot.java index 1215c278..5720de36 100644 --- a/common/buildcraft/robots/EntityRobot.java +++ b/common/buildcraft/robots/EntityRobot.java @@ -25,6 +25,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; +import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -1115,4 +1116,15 @@ public class EntityRobot extends EntityRobotBase implements return new FluidTankInfo[] {new FluidTankInfo(tank, maxFluid)}; } + @SideOnly(Side.CLIENT) + public IIcon getItemIcon(ItemStack stack, int renderPass) { + IIcon iicon = super.getItemIcon(stack, renderPass); + + if (iicon == null) { + iicon = stack.getItem().getIcon(stack, renderPass, null, itemInUse, 0); + } + + return iicon; + } + } diff --git a/common/buildcraft/robots/ai/AIRobotStripesHandler.java b/common/buildcraft/robots/ai/AIRobotStripesHandler.java new file mode 100644 index 00000000..878a991f --- /dev/null +++ b/common/buildcraft/robots/ai/AIRobotStripesHandler.java @@ -0,0 +1,114 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.robots.ai; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.WorldServer; + +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.core.BlockIndex; +import buildcraft.api.core.Position; +import buildcraft.api.robots.AIRobot; +import buildcraft.api.robots.EntityRobotBase; +import buildcraft.api.transport.IStripesActivator; +import buildcraft.api.transport.IStripesHandler; +import buildcraft.api.transport.IStripesHandler.StripesHandlerType; +import buildcraft.api.transport.PipeManager; +import buildcraft.core.inventory.InvUtils; +import buildcraft.core.proxy.CoreProxy; +import buildcraft.transport.stripes.StripesHandlerDefault; + +public class AIRobotStripesHandler extends AIRobot implements IStripesActivator { + + private static IStripesHandler defaultItemsHandler = new StripesHandlerDefault(); + + private BlockIndex useToBlock; + private int useCycles = 0; + + public AIRobotStripesHandler(EntityRobotBase iRobot) { + super(iRobot); + } + + public AIRobotStripesHandler(EntityRobotBase iRobot, BlockIndex index) { + super(iRobot); + + useToBlock = index; + } + + @Override + public void start() { + robot.aimItemAt(useToBlock.x, useToBlock.y, useToBlock.z); + robot.setItemActive(true); + } + + @Override + public void update() { + useCycles++; + + if (useCycles > 60) { + ItemStack stack = robot.getHeldItem(); + + ForgeDirection direction = ForgeDirection.NORTH; + + Position p = new Position(useToBlock.x, useToBlock.y, useToBlock.z); + + EntityPlayer player = CoreProxy.proxy.getBuildCraftPlayer( + (WorldServer) robot.worldObj, (int) p.x, (int) p.y, + (int) p.z).get(); + player.rotationPitch = 0; + player.rotationYaw = 180; + + for (IStripesHandler handler : PipeManager.stripesHandlers) { + if (handler.getType() == StripesHandlerType.ITEM_USE + && handler.shouldHandle(stack)) { + if (handler.handle(robot.worldObj, (int) p.x, (int) p.y, + (int) p.z, direction, stack, player, this)) { + robot.setItemInUse(null); + terminate(); + return; + } + } + } + + if (defaultItemsHandler.handle(robot.worldObj, (int) p.x, (int) p.y, + (int) p.z, direction, stack, player, this)) { + robot.setItemInUse(null); + } + terminate(); + } + } + + private ForgeDirection getDirection() { + + return null; + } + + @Override + public void end() { + robot.setItemActive(false); + } + + @Override + public int getEnergyCost() { + return 70; + } + + @Override + public void sendItem(ItemStack stack, ForgeDirection direction) { + InvUtils.dropItems(robot.worldObj, stack, (int) Math.floor(robot.posX), + (int) Math.floor(robot.posY), (int) Math.floor(robot.posZ)); + } + + @Override + public void dropItem(ItemStack stack, ForgeDirection direction) { + sendItem(stack, direction); + } +} diff --git a/common/buildcraft/robots/boards/BoardRobotStripes.java b/common/buildcraft/robots/boards/BoardRobotStripes.java new file mode 100644 index 00000000..35c6bd3b --- /dev/null +++ b/common/buildcraft/robots/boards/BoardRobotStripes.java @@ -0,0 +1,129 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.robots.boards; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import buildcraft.api.boards.RedstoneBoardRobot; +import buildcraft.api.boards.RedstoneBoardRobotNBT; +import buildcraft.api.core.BlockIndex; +import buildcraft.api.robots.AIRobot; +import buildcraft.api.robots.EntityRobotBase; +import buildcraft.core.inventory.filters.IStackFilter; +import buildcraft.core.utils.IBlockFilter; +import buildcraft.robots.ResourceIdBlock; +import buildcraft.robots.RobotRegistry; +import buildcraft.robots.ai.AIRobotFetchAndEquipItemStack; +import buildcraft.robots.ai.AIRobotGotoBlock; +import buildcraft.robots.ai.AIRobotGotoSleep; +import buildcraft.robots.ai.AIRobotSearchRandomBlock; +import buildcraft.robots.ai.AIRobotStripesHandler; + +public class BoardRobotStripes extends RedstoneBoardRobot { + + private BlockIndex blockFound; + + public BoardRobotStripes(EntityRobotBase iRobot) { + super(iRobot); + } + + @Override + public RedstoneBoardRobotNBT getNBTHandler() { + return BoardRobotStripesNBT.instance; + } + + @Override + public void update() { + if (robot.getHeldItem() == null) { + startDelegateAI(new AIRobotFetchAndEquipItemStack(robot, new IStackFilter() { + @Override + public boolean matches(ItemStack stack) { + return stack != null; + } + })); + } else { + startDelegateAI(new AIRobotSearchRandomBlock(robot, new IBlockFilter() { + @Override + public boolean matches(World world, int x, int y, int z) { + return world.getBlock(x, y, z).isAir(world, x, y, z) + && !robot.getRegistry().isTaken(new ResourceIdBlock(x, y, z)); + } + })); + } + } + + @Override + public void delegateAIEnded(AIRobot ai) { + if (ai instanceof AIRobotSearchRandomBlock) { + AIRobotSearchRandomBlock searchAI = (AIRobotSearchRandomBlock) ai; + + if (searchAI.blockFound != null + && RobotRegistry.getRegistry(robot.worldObj).take( + new ResourceIdBlock(searchAI.blockFound), robot)) { + searchAI.unreserve(); + + if (blockFound != null) { + robot.getRegistry().release(new ResourceIdBlock(blockFound)); + } + + blockFound = searchAI.blockFound; + startDelegateAI(new AIRobotGotoBlock(robot, searchAI.path)); + } else { + if (searchAI.blockFound != null) { + searchAI.unreserve(); + } + startDelegateAI(new AIRobotGotoSleep(robot)); + } + } else if (ai instanceof AIRobotGotoBlock) { + startDelegateAI(new AIRobotStripesHandler(robot, blockFound)); + } else if (ai instanceof AIRobotFetchAndEquipItemStack) { + if (robot.getHeldItem() == null) { + startDelegateAI(new AIRobotGotoSleep(robot)); + } + } else if (ai instanceof AIRobotStripesHandler) { + robot.getRegistry().release(new ResourceIdBlock(blockFound)); + blockFound = null; + } + } + + @Override + public void end() { + if (blockFound != null) { + robot.getRegistry().release(new ResourceIdBlock(blockFound)); + } + } + + @Override + public void writeSelfToNBT(NBTTagCompound nbt) { + super.writeSelfToNBT(nbt); + + if (blockFound != null) { + NBTTagCompound sub = new NBTTagCompound(); + blockFound.writeTo(sub); + nbt.setTag("blockFound", sub); + } + } + + @Override + public void loadSelfFromNBT(NBTTagCompound nbt) { + super.loadSelfFromNBT(nbt); + + if (nbt.hasKey("blockFound")) { + blockFound = new BlockIndex(nbt.getCompoundTag("blockFound")); + } + } + + private boolean isAirAbove(World world, int x, int y, int z) { + synchronized (world) { + return world.isAirBlock(x, y + 1, z); + } + } +} diff --git a/common/buildcraft/robots/boards/BoardRobotStripesNBT.java b/common/buildcraft/robots/boards/BoardRobotStripesNBT.java new file mode 100644 index 00000000..e89b3c2e --- /dev/null +++ b/common/buildcraft/robots/boards/BoardRobotStripesNBT.java @@ -0,0 +1,64 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.robots.boards; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + +import buildcraft.api.boards.RedstoneBoardRobot; +import buildcraft.api.boards.RedstoneBoardRobotNBT; +import buildcraft.api.robots.EntityRobotBase; +import buildcraft.core.DefaultProps; +import buildcraft.core.utils.StringUtils; + +public final class BoardRobotStripesNBT extends RedstoneBoardRobotNBT { + + public static BoardRobotStripesNBT instance = new BoardRobotStripesNBT(); + + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", + DefaultProps.TEXTURE_PATH_ENTITIES + "/robot_stripes.png"); + + private IIcon icon; + + @Override + public RedstoneBoardRobot create(NBTTagCompound nbt, EntityRobotBase robot) { + return new BoardRobotStripes(robot); + } + + @Override + public ResourceLocation getRobotTexture() { + return TEXTURE; + } + + @Override + public String getID() { + return "buildcraft:boardRobotStripes"; + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) { + list.add(StringUtils.localize("buildcraft.boardRobotStripes")); + } + + @Override + public void registerIcons(IIconRegister iconRegister) { + icon = iconRegister.registerIcon("buildcraft:board_yellow"); + } + + @Override + public IIcon getIcon(NBTTagCompound nbt) { + return icon; + } +} diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 5604a380..233d79b6 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -41,7 +41,7 @@ import buildcraft.transport.utils.TransportUtils; public class PipeItemsStripes extends Pipe implements IEnergyHandler, IStripesPipe { - private IStripesHandler defaultItemsHandler = new StripesHandlerDefault(); + private static IStripesHandler defaultItemsHandler = new StripesHandlerDefault(); public PipeItemsStripes(Item item) { super(new PipeTransportItems(), item); diff --git a/common/buildcraft/transport/stripes/StripesHandlerArrow.java b/common/buildcraft/transport/stripes/StripesHandlerArrow.java index 132cb364..7f5a248f 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerArrow.java +++ b/common/buildcraft/transport/stripes/StripesHandlerArrow.java @@ -8,8 +8,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; -import buildcraft.api.transport.IStripesPipe; public class StripesHandlerArrow implements IStripesHandler { @@ -26,7 +26,7 @@ public class StripesHandlerArrow implements IStripesHandler { @Override public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, - IStripesPipe pipe) { + IStripesActivator activator) { EntityArrow entityArrow = new EntityArrow(world, player, 0); entityArrow.setPosition(x + 0.5d, y + 0.5d, z + 0.5d); @@ -39,7 +39,7 @@ public class StripesHandlerArrow implements IStripesHandler { stack.stackSize--; if (stack.stackSize > 0) { - pipe.sendItem(stack, direction.getOpposite()); + activator.sendItem(stack, direction.getOpposite()); } return true; diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java index 903b3a5a..2fbd5fea 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java +++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java @@ -14,8 +14,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; +import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; -import buildcraft.api.transport.IStripesPipe; public class StripesHandlerBucket implements IStripesHandler { private static final ItemStack emptyBucket = new ItemStack(Items.bucket, 1); @@ -33,16 +33,16 @@ public class StripesHandlerBucket implements IStripesHandler { @Override public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, - IStripesPipe pipe) { + IStripesActivator activator) { Block block = world.getBlock(x, y, z); if (block == Blocks.air) { Block underblock = world.getBlock(x, y - 1, z); if (((ItemBucket) stack.getItem()).tryPlaceContainedLiquid(world, x, y - 1, z)) { - pipe.sendItem(emptyBucket, direction.getOpposite()); + activator.sendItem(emptyBucket, direction.getOpposite()); stack.stackSize--; if (stack.stackSize > 0) { - pipe.sendItem(stack, direction.getOpposite()); + activator.sendItem(stack, direction.getOpposite()); } return true; @@ -66,10 +66,10 @@ public class StripesHandlerBucket implements IStripesHandler { if (filledBucket != null) { world.setBlockToAir(x, y - 1, z); - pipe.sendItem(filledBucket, direction.getOpposite()); + activator.sendItem(filledBucket, direction.getOpposite()); stack.stackSize--; if (stack.stackSize > 0) { - pipe.sendItem(stack, direction.getOpposite()); + activator.sendItem(stack, direction.getOpposite()); } return true; diff --git a/common/buildcraft/transport/stripes/StripesHandlerDefault.java b/common/buildcraft/transport/stripes/StripesHandlerDefault.java index 3b7e3d4f..d2e31fec 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerDefault.java +++ b/common/buildcraft/transport/stripes/StripesHandlerDefault.java @@ -14,8 +14,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; -import buildcraft.api.transport.IStripesPipe; public class StripesHandlerDefault implements IStripesHandler { @@ -32,14 +32,14 @@ public class StripesHandlerDefault implements IStripesHandler { @Override public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, - IStripesPipe pipe) { + IStripesActivator activator) { if (!world.isAirBlock(x, y, z)) { return false; } if (!stack.tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0.0f, 0.0f, 0.0f)) { return false; } - pipe.sendItem(stack, direction.getOpposite()); + activator.sendItem(stack, direction.getOpposite()); return true; } diff --git a/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java b/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java index 222923d9..414a6761 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java +++ b/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java @@ -20,8 +20,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; -import buildcraft.api.transport.IStripesPipe; public class StripesHandlerEntityInteract implements IStripesHandler { @@ -38,7 +38,7 @@ public class StripesHandlerEntityInteract implements IStripesHandler { @Override public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, - IStripesPipe pipe) { + IStripesActivator activator) { AxisAlignedBB box = AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); List entities = world.getEntitiesWithinAABBExcludingEntity(null, box); @@ -64,21 +64,21 @@ public class StripesHandlerEntityInteract implements IStripesHandler { continue; } successful = true; - dropItemsExcept(stack, player, pipe, direction); + dropItemsExcept(stack, player, activator, direction); } if (stack.stackSize > 0) { - pipe.sendItem(stack, direction.getOpposite()); + activator.sendItem(stack, direction.getOpposite()); } return successful; } - private void dropItemsExcept(ItemStack stack, EntityPlayer player, IStripesPipe pipe, ForgeDirection direction) { + private void dropItemsExcept(ItemStack stack, EntityPlayer player, IStripesActivator activator, ForgeDirection direction) { for (int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack invStack = player.inventory.getStackInSlot(i); if (invStack != null && invStack != stack) { player.inventory.setInventorySlotContents(i, null); - pipe.sendItem(invStack, direction.getOpposite()); + activator.sendItem(invStack, direction.getOpposite()); } } } diff --git a/common/buildcraft/transport/stripes/StripesHandlerPipes.java b/common/buildcraft/transport/stripes/StripesHandlerPipes.java index 77460f76..af56f048 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPipes.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPipes.java @@ -18,8 +18,8 @@ import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftTransport; import buildcraft.api.core.Position; +import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; -import buildcraft.api.transport.IStripesPipe; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.ItemPipe; import buildcraft.transport.Pipe; @@ -41,7 +41,7 @@ public class StripesHandlerPipes implements IStripesHandler { @Override public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, - IStripesPipe pipe) { + IStripesActivator activator) { if (!(stack.getItem() instanceof ItemPipe) || (stack.getItem() == BuildCraftTransport.pipeItemsStripes)) { return false; diff --git a/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java b/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java index 64692ba5..d04738a3 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java @@ -15,8 +15,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; -import buildcraft.api.transport.IStripesPipe; public class StripesHandlerPlaceBlock implements IStripesHandler { @@ -33,7 +33,7 @@ public class StripesHandlerPlaceBlock implements IStripesHandler { @Override public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, - IStripesPipe pipe) { + IStripesActivator activator) { if (!world.isAirBlock(x, y, z)) { return false; } diff --git a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java index 75511144..492d1a99 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerRightClick.java +++ b/common/buildcraft/transport/stripes/StripesHandlerRightClick.java @@ -8,8 +8,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; -import buildcraft.api.transport.IStripesPipe; public class StripesHandlerRightClick implements IStripesHandler { @@ -28,9 +28,9 @@ public class StripesHandlerRightClick implements IStripesHandler { @Override public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, - IStripesPipe pipe) { + IStripesActivator activator) { ItemStack remainingStack = stack.getItem().onItemRightClick(stack, world, player); - pipe.sendItem(remainingStack, direction.getOpposite()); + activator.sendItem(remainingStack, direction.getOpposite()); return true; } diff --git a/common/buildcraft/transport/stripes/StripesHandlerShears.java b/common/buildcraft/transport/stripes/StripesHandlerShears.java index ae819d19..abfb245c 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerShears.java +++ b/common/buildcraft/transport/stripes/StripesHandlerShears.java @@ -13,8 +13,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.transport.IStripesActivator; import buildcraft.api.transport.IStripesHandler; -import buildcraft.api.transport.IStripesPipe; public class StripesHandlerShears implements IStripesHandler { @@ -31,7 +31,7 @@ public class StripesHandlerShears implements IStripesHandler { @Override public boolean handle(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, - IStripesPipe pipe) { + IStripesActivator activator) { Block block = world.getBlock(x, y, z); if (block instanceof IShearable) { @@ -42,9 +42,9 @@ public class StripesHandlerShears implements IStripesHandler { EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack)); world.setBlockToAir(x, y, z); stack.damageItem(1, player); - pipe.sendItem(stack, direction.getOpposite()); + activator.sendItem(stack, direction.getOpposite()); for (ItemStack dropStack : drops) { - pipe.sendItem(dropStack, direction.getOpposite()); + activator.sendItem(dropStack, direction.getOpposite()); } return true; } From e79e4034f8861bf517414035e4c11e34ac7c2db4 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Thu, 19 Feb 2015 21:32:20 -0300 Subject: [PATCH 35/67] make PipeItemsStripes.dropItem actually drop the item, in case anyone uses the api --- common/buildcraft/transport/pipes/PipeItemsStripes.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 233d79b6..217b990e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -28,6 +28,7 @@ import buildcraft.api.transport.IStripesHandler; import buildcraft.api.transport.IStripesHandler.StripesHandlerType; import buildcraft.api.transport.IStripesPipe; import buildcraft.api.transport.PipeManager; +import buildcraft.core.inventory.InvUtils; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtils; import buildcraft.transport.Pipe; @@ -124,9 +125,8 @@ public class PipeItemsStripes extends Pipe implements IEnerg container.zCoord, direction); p.moveForwards(1.0); - itemStack.tryPlaceItemIntoWorld(CoreProxy.proxy.getBuildCraftPlayer((WorldServer) getWorld()).get(), - getWorld(), (int) p.x, (int) p.y, (int) p.z, 1, 0.0f, 0.0f, - 0.0f); + InvUtils.dropItems(getWorld(), itemStack, (int) p.x, (int) p.y, (int) p.z); + } @Override From 9d61900d5f40912c53fc256a3cae4f5c9bfbac58 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Fri, 20 Feb 2015 00:45:03 -0300 Subject: [PATCH 36/67] fix Quarry not chunkloading in dimensions other than overworld, fixes #2417 and maybe #2322 --- common/buildcraft/BuildCraftFactory.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index c690b365..10026e1b 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -115,12 +115,10 @@ public class BuildCraftFactory extends BuildCraftMod { int quarryY = ticket.getModData().getInteger("quarryY"); int quarryZ = ticket.getModData().getInteger("quarryZ"); - if (world.blockExists(quarryX, quarryY, quarryZ)) { - Block block = world.getBlock(quarryX, quarryY, quarryZ); - if (block == quarryBlock) { - TileQuarry tq = (TileQuarry) world.getTileEntity(quarryX, quarryY, quarryZ); - tq.forceChunkLoading(ticket); - } + Block block = world.getBlock(quarryX, quarryY, quarryZ); + if (block == quarryBlock) { + TileQuarry tq = (TileQuarry) world.getTileEntity(quarryX, quarryY, quarryZ); + tq.forceChunkLoading(ticket); } } } @@ -133,11 +131,9 @@ public class BuildCraftFactory extends BuildCraftMod { int quarryY = ticket.getModData().getInteger("quarryY"); int quarryZ = ticket.getModData().getInteger("quarryZ"); - if (world.blockExists(quarryX, quarryY, quarryZ)) { - Block block = world.getBlock(quarryX, quarryY, quarryZ); - if (block == quarryBlock) { - validTickets.add(ticket); - } + Block block = world.getBlock(quarryX, quarryY, quarryZ); + if (block == quarryBlock) { + validTickets.add(ticket); } } return validTickets; From 5f3ea0fe0b4fc53aa7d0761d2ac749a43f0d57e8 Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Fri, 20 Feb 2015 08:46:32 -0300 Subject: [PATCH 37/67] add stripes pipe retraction with void pipes --- .../buildcraft/transport/TileGenericPipe.java | 2 + .../stripes/StripesHandlerPipes.java | 59 +++++++++++++++---- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 0723645c..86a3977c 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -432,6 +432,8 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, public void initializeFromItemMetadata(int i) { if (i >= 1 && i <= 16) { setPipeColor((i - 1) & 15); + } else { + setPipeColor(-1); } } diff --git a/common/buildcraft/transport/stripes/StripesHandlerPipes.java b/common/buildcraft/transport/stripes/StripesHandlerPipes.java index af56f048..b2c08fe1 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPipes.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPipes.java @@ -8,6 +8,8 @@ */ package buildcraft.transport.stripes; +import java.util.ArrayList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -32,7 +34,7 @@ public class StripesHandlerPipes implements IStripesHandler { public StripesHandlerType getType() { return StripesHandlerType.ITEM_USE; } - + @Override public boolean shouldHandle(ItemStack stack) { return stack.getItem() instanceof ItemPipe; @@ -50,10 +52,10 @@ public class StripesHandlerPipes implements IStripesHandler { if (world.getBlock(x, y, z) != Blocks.air) { return false; } - + Position p = new Position(x, y, z, direction); p.moveBackwards(1.0d); - + TileEntity tile = world.getTileEntity((int) p.x, (int) p.y, (int) p.z); if (!(tile instanceof TileGenericPipe)) { return false; @@ -62,23 +64,32 @@ public class StripesHandlerPipes implements IStripesHandler { if (!(pipeTile.pipe.transport instanceof PipeTransportItems)) { return false; } - // Checks done, start to actually do stuff + + if (stack.getItem() != BuildCraftTransport.pipeItemsVoid) { + return extendPipe(world, x, y, z, direction, stack, player, pipeTile); + } else { + p.moveBackwards(1.0d); + return retractPipe(world, (int) p.x, (int) p.y, (int) p.z, direction, stack, player, pipeTile); + } + } + + private boolean extendPipe(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, + TileGenericPipe pipeTile) { if (!copyPipeTo(world, pipeTile, x, y, z, player)) { return false; } - pipeTile.pipe.transport.container.initializeFromItemMetadata(stack.getItemDamage() - 1); + pipeTile.initializeFromItemMetadata(stack.getItemDamage()); Pipe newPipe = BlockGenericPipe.createPipe(stack.getItem()); - newPipe.setTile(pipeTile.pipe.container); - pipeTile.pipe.container.pipe = newPipe; + newPipe.setTile(pipeTile); + pipeTile.pipe = newPipe; pipeTile.updateEntity(); // Needed so that the tile does computeConnections() - + stack.stackSize--; if (stack.stackSize > 0) { - pipeTile.pipe.container.injectItem(stack, true, direction.getOpposite()); + pipeTile.injectItem(stack, true, direction.getOpposite()); } - return true; } @@ -90,4 +101,32 @@ public class StripesHandlerPipes implements IStripesHandler { } return true; } + + private boolean retractPipe(World world, int x, int y, int z, ForgeDirection direction, ItemStack stack, EntityPlayer player, + TileGenericPipe pipeTile) { + TileEntity prevTile = world.getTileEntity(x, y, z); + if (!(prevTile instanceof TileGenericPipe)) { + return false; + } + TileGenericPipe prevPipeTile = (TileGenericPipe) prevTile; + if (!(prevPipeTile.pipe.transport instanceof PipeTransportItems)) { + return false; + } + + int meta = prevPipeTile.getItemMetadata(); + ArrayList removedPipeStacks = world.getBlock(x, y, z).getDrops(world, x, y, z, meta, 0); + + prevPipeTile.initializeFromItemMetadata(pipeTile.getItemMetadata()); + Pipe newPipe = BlockGenericPipe.createPipe(BuildCraftTransport.pipeItemsStripes); + newPipe.setTile(prevPipeTile); + prevPipeTile.pipe = newPipe; + + world.setBlockToAir(pipeTile.x(), pipeTile.y(), pipeTile.z()); + + prevPipeTile.injectItem(stack, true, direction); + for (ItemStack itemStack : removedPipeStacks) { + prevPipeTile.injectItem(itemStack, true, direction); + } + return true; + } } From 85ff775fcf99cd483f39d51317183ce68dc367b8 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 22 Feb 2015 09:16:31 +0100 Subject: [PATCH 38/67] fix #2472 --- common/buildcraft/factory/BlockMiner.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/buildcraft/factory/BlockMiner.java b/common/buildcraft/factory/BlockMiner.java index 2134a627..e1747ae3 100644 --- a/common/buildcraft/factory/BlockMiner.java +++ b/common/buildcraft/factory/BlockMiner.java @@ -113,11 +113,6 @@ public class BlockMiner { + (meta << 12)); Utils.preDestroyBlock(world, x, y, z); - - if (block.hasTileEntity(meta)) { - world.removeTileEntity(x, y, z); - } - world.setBlockToAir(x, y, z); } else { hasFailed = true; From be6c0e09df545ae21f21f63c63b3bd1cabe9db59 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 22 Feb 2015 09:23:00 +0100 Subject: [PATCH 39/67] fix #2469, #2456 --- .../buildcraft/transport/BlockGenericPipe.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 5611b6da..6cbb7bb6 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -1113,14 +1113,16 @@ public class BlockGenericPipe extends BlockBuildCraft { } public static void updateNeighbourSignalState(Pipe pipe) { - TileBuffer[] neighbours = pipe.container.getTileCache(); + if (pipe != null && pipe.container != null) { + TileBuffer[] neighbours = pipe.container.getTileCache(); - if (neighbours != null) { - for (int i = 0; i < 6; i++) { - if (neighbours[i] != null && neighbours[i].getTile() instanceof IPipeTile && - !neighbours[i].getTile().isInvalid() && - ((IPipeTile) neighbours[i].getTile()).getPipe() instanceof Pipe) { - ((Pipe) ((IPipeTile) neighbours[i].getTile()).getPipe()).updateSignalState(); + if (neighbours != null) { + for (int i = 0; i < 6; i++) { + if (neighbours[i] != null && neighbours[i].getTile() instanceof IPipeTile && + !neighbours[i].getTile().isInvalid() && + ((IPipeTile) neighbours[i].getTile()).getPipe() instanceof Pipe) { + ((Pipe) ((IPipeTile) neighbours[i].getTile()).getPipe()).updateSignalState(); + } } } } From e2ae3a349a23e891e5fc999faa3fb68dfdcd6f89 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 22 Feb 2015 21:48:21 +0100 Subject: [PATCH 40/67] revert BuildCraft power to the 4.2.2 @CovertJaguar system, fix Gate Copier issues --- common/buildcraft/transport/Gate.java | 13 ++ .../buildcraft/transport/ItemGateCopier.java | 16 +- .../transport/PipeTransportPower.java | 161 ++++++------------ 3 files changed, 70 insertions(+), 120 deletions(-) diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index 3e44bc2d..3a374158 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -216,6 +216,19 @@ public final class Gate implements IGate, IStatementContainer { } public void readStatementsFromNBT(NBTTagCompound data) { + // Clear + for (int i = 0; i < material.numSlots; ++i) { + triggers[i] = null; + actions[i] = null; + for (int j = 0; j < material.numTriggerParameters; j++) { + triggerParameters[i][j] = null; + } + for (int j = 0; j < material.numActionParameters; j++) { + actionParameters[i][j] = null; + } + } + + // Read for (int i = 0; i < material.numSlots; ++i) { if (data.hasKey("trigger[" + i + "]")) { triggers[i] = StatementManager.statements.get(data.getString("trigger[" + i + "]")); diff --git a/common/buildcraft/transport/ItemGateCopier.java b/common/buildcraft/transport/ItemGateCopier.java index 167fad82..342b31bf 100644 --- a/common/buildcraft/transport/ItemGateCopier.java +++ b/common/buildcraft/transport/ItemGateCopier.java @@ -52,15 +52,15 @@ public class ItemGateCopier extends ItemBuildCraft { Gate gate = null; if (tile == null || !(tile instanceof TileGenericPipe) || !(block instanceof BlockGenericPipe)) { - return false; - } - - RaytraceResult rayTraceResult = ((BlockGenericPipe) block).doRayTrace(world, x, y, z, player); + isCopying = true; + } else { + RaytraceResult rayTraceResult = ((BlockGenericPipe) block).doRayTrace(world, x, y, z, player); - if (rayTraceResult != null && rayTraceResult.boundingBox != null && rayTraceResult.hitPart == Part.Pluggable) { - PipePluggable pluggable = ((TileGenericPipe) tile).getPipePluggable(rayTraceResult.sideHit); - if (pluggable instanceof GatePluggable) { - gate = ((TileGenericPipe) tile).pipe.gates[rayTraceResult.sideHit.ordinal()]; + if (rayTraceResult != null && rayTraceResult.boundingBox != null && rayTraceResult.hitPart == Part.Pluggable) { + PipePluggable pluggable = ((TileGenericPipe) tile).getPipePluggable(rayTraceResult.sideHit); + if (pluggable instanceof GatePluggable) { + gate = ((TileGenericPipe) tile).pipe.gates[rayTraceResult.sideHit.ordinal()]; + } } } diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 054c6f1a..feb2b510 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -199,102 +199,58 @@ public class PipeTransportPower extends PipeTransport { } // Send the power to nearby pipes who requested it - System.arraycopy(displayPower, 0, prevDisplayPower, 0, 6); Arrays.fill(displayPower, (short) 0); - // STEP 1 - computes the total amount of power contained and total - // amount of power queried - - int totalPowerContained = 0; - int totalPowerQuery = 0; - - for (int dir = 0; dir < 6; ++dir) { - totalPowerContained += internalPower[dir]; - if (internalPower[dir] == 0) { - totalPowerQuery += powerQuery[dir]; - } - } - - // STEP 2 - sends the power to all directions and computes the actual - // amount of power that was consumed - - int totalPowerConsumed = 0; - - if (totalPowerContained > 0) { - for (int out = 0; out < 6; ++out) { - externalPower[out] = 0; - - if (powerQuery[out] > 0 && internalPower[out] == 0) { - int powerConsumed = powerQuery[out] * totalPowerContained / totalPowerQuery; - boolean tilePowered = false; - - if (tiles[out] instanceof IPipeTile) { - // Transmit power to the nearby pipe - - Pipe nearbyPipe = (Pipe) ((IPipeTile) tiles[out]).getPipe(); - PipeTransportPower nearbyTransport = (PipeTransportPower) nearbyPipe.transport; - powerConsumed = nearbyTransport.receiveEnergy( - ForgeDirection.VALID_DIRECTIONS[out].getOpposite(), - powerConsumed); - tilePowered = true; - } else if (tiles[out] instanceof IEnergyHandler) { - IEnergyHandler handler = (IEnergyHandler) tiles[out]; - - if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[out].getOpposite())) { - // Transmit power to an RF energy handler - - powerConsumed = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[out].getOpposite(), - powerConsumed, false); - tilePowered = true; + for (int i = 0; i < 6; ++i) { + if (internalPower[i] > 0) { + float totalPowerQuery = 0; + for (int j = 0; j < 6; ++j) { + if (j != i && powerQuery[j] > 0) + if (tiles[j] instanceof TileGenericPipe || tiles[j] instanceof IEnergyReceiver || tiles[j] instanceof IEnergyHandler) { + totalPowerQuery += powerQuery[j]; } - } else if (tiles[out] instanceof IEnergyReceiver) { - IEnergyReceiver handler = (IEnergyReceiver) tiles[out]; + } + for (int j = 0; j < 6; ++j) { + if (j != i && powerQuery[j] > 0) { + int watts = (int) Math.floor((internalPower[i] * powerQuery[j]) / totalPowerQuery); - if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[out].getOpposite())) { - // Transmit power to an RF energy handler - - powerConsumed = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[out].getOpposite(), - powerConsumed, false); - tilePowered = true; + if (tiles[j] instanceof IPipeTile) { + Pipe nearbyPipe = (Pipe) ((IPipeTile) tiles[j]).getPipe(); + PipeTransportPower nearbyTransport = (PipeTransportPower) nearbyPipe.transport; + watts = nearbyTransport.receiveEnergy( + ForgeDirection.VALID_DIRECTIONS[j].getOpposite(), + watts); + internalPower[i] -= watts; + } else if (tiles[j] instanceof IEnergyHandler) { + IEnergyHandler handler = (IEnergyHandler) tiles[j]; + if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite())) { + watts = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite(), + watts, false); + internalPower[i] -= watts; + } + } else if (tiles[j] instanceof IEnergyReceiver) { + IEnergyReceiver handler = (IEnergyReceiver) tiles[j]; + if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite())) { + watts = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite(), + watts, false); + internalPower[i] -= watts; + } } - } - if (!tilePowered) { - externalPower[out] = powerConsumed; + displayPower[j] += watts; + displayPower[i] += watts; } - - displayPower[out] += powerConsumed; - totalPowerConsumed += powerConsumed; } } } - - // STEP 3 - assume equal repartition of all consumed locations and - // compute display for each source of power - - if (totalPowerConsumed > 0) { - for (int in = 0; in < 6; ++in) { - int powerConsumed = internalPower[in] * totalPowerConsumed / totalPowerContained; - displayPower[in] += powerConsumed; - } - } - - // NEXT STEPS... other things to do... - - highestPower = 0; + double highestPower = 0; for (int i = 0; i < 6; i++) { displayPower[i] = (short) ((prevDisplayPower[i] * (DISPLAY_SMOOTHING - 1.0F) + displayPower[i]) / DISPLAY_SMOOTHING); - if (displayPower[i] > highestPower) { highestPower = displayPower[i]; } - - if (displayPower[i] < 0) { - displayPower[i] = 0; - } } - overload += highestPower > maxPower * 0.95 ? 1 : -1; if (overload < 0) { overload = 0; @@ -303,24 +259,21 @@ public class PipeTransportPower extends PipeTransport { overload = OVERLOAD_TICKS; } - // Compute the tiles requesting energy that are not power pipes - + // Compute the tiles requesting energy that are not power pipes for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (!outputOpen(dir)) { - continue; + if (!outputOpen(dir)) { + continue; } TileEntity tile = tiles [dir.ordinal()]; - - if (tile instanceof IPipeTile && ((Pipe) ((IPipeTile) tile).getPipe()).transport instanceof PipeTransportPower) { - continue; - } - + + if (tile instanceof IPipeTile && ((Pipe) ((IPipeTile) tile).getPipe()).transport instanceof PipeTransportPower) { + continue; + } if (tile instanceof IEnergyHandler) { IEnergyHandler handler = (IEnergyHandler) tile; if (handler.canConnectEnergy(dir.getOpposite())) { int request = handler.receiveEnergy(dir.getOpposite(), this.maxPower, true); - if (request > 0) { requestEnergy(dir, request); } @@ -329,7 +282,6 @@ public class PipeTransportPower extends PipeTransport { IEnergyReceiver handler = (IEnergyReceiver) tile; if (handler.canConnectEnergy(dir.getOpposite())) { int request = handler.receiveEnergy(dir.getOpposite(), this.maxPower, true); - if (request > 0) { requestEnergy(dir, request); } @@ -338,46 +290,35 @@ public class PipeTransportPower extends PipeTransport { } // Sum the amount of energy requested on each side - int[] transferQuery = new int[6]; - for (int i = 0; i < 6; ++i) { transferQuery[i] = 0; - - if (!inputOpen(ForgeDirection.getOrientation(i))) { - continue; - } - for (int j = 0; j < 6; ++j) { if (j != i) { transferQuery[i] += powerQuery[j]; } } - transferQuery[i] = Math.min(transferQuery[i], maxPower); } // Transfer the requested energy to nearby pipes - for (int i = 0; i < 6; ++i) { if (transferQuery[i] != 0) { if (tiles[i] != null) { TileEntity entity = tiles[i]; - - if (entity instanceof IPipeTile) { - Pipe nearbyPipe = (Pipe) ((IPipeTile) entity).getPipe(); - - if (nearbyPipe == null) { + if (entity instanceof TileGenericPipe) { + TileGenericPipe nearbyTile = (TileGenericPipe) entity; + if (nearbyTile.pipe == null) { continue; } - - PipeTransportPower nearbyTransport = (PipeTransportPower) nearbyPipe.transport; + PipeTransportPower nearbyTransport = (PipeTransportPower) nearbyTile.pipe.transport; nearbyTransport.requestEnergy(ForgeDirection.VALID_DIRECTIONS[i].getOpposite(), transferQuery[i]); } } } } + if (tracker.markTimeIfDelay(container.getWorldObj())) { PacketPowerUpdate packet = new PacketPowerUpdate(container.xCoord, container.yCoord, container.zCoord); @@ -399,13 +340,9 @@ public class PipeTransportPower extends PipeTransport { powerQuery = nextPowerQuery; nextPowerQuery = new int[6]; + int[] next = internalPower; internalPower = internalNextPower; - internalNextPower = new int[6]; - - for (int i = 0; i < internalNextPower.length; ++i) { - internalNextPower[i] = 0; - nextPowerQuery[i] = 0; - } + internalNextPower = internalPower; } } From b04c93c4e2537345bc38a3e3fef1bad88dca9e75 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 22 Feb 2015 22:27:10 +0100 Subject: [PATCH 41/67] temporaily restore docking station support for an early 6.4.0 release --- .../robots/RobotStationPluggable.java | 26 ++++++++++++++- .../buildcraft/robots/ai/AIRobotRecharge.java | 8 ----- .../transport/PipeTransportPower.java | 32 +++++++++++++------ 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/common/buildcraft/robots/RobotStationPluggable.java b/common/buildcraft/robots/RobotStationPluggable.java index 42ce289c..e083afd1 100644 --- a/common/buildcraft/robots/RobotStationPluggable.java +++ b/common/buildcraft/robots/RobotStationPluggable.java @@ -9,6 +9,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.energy.IEnergyReceiver; import buildcraft.BuildCraftTransport; import buildcraft.api.core.render.ITextureStates; import buildcraft.api.transport.IPipe; @@ -20,7 +21,7 @@ import buildcraft.core.utils.MatrixTranformations; import buildcraft.transport.PipeIconProvider; import buildcraft.transport.TileGenericPipe; -public class RobotStationPluggable extends PipePluggable implements IPipePluggableItem { +public class RobotStationPluggable extends PipePluggable implements IPipePluggableItem, IEnergyReceiver { public class RobotStationPluggableRenderer implements IPipePluggableRenderer { private float zFightOffset = 1 / 4096.0F; @@ -251,4 +252,27 @@ public class RobotStationPluggable extends PipePluggable implements IPipePluggab public PipePluggable createPipePluggable(IPipe pipe, ForgeDirection side, ItemStack stack) { return new RobotStationPluggable(); } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if (station != null && station.isTaken()) { + return station.robotTaking().getBattery().receiveEnergy(maxReceive, simulate); + } + return 0; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return 0; + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return 0; + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return true; + } } diff --git a/common/buildcraft/robots/ai/AIRobotRecharge.java b/common/buildcraft/robots/ai/AIRobotRecharge.java index f2c03f70..f04e00e7 100755 --- a/common/buildcraft/robots/ai/AIRobotRecharge.java +++ b/common/buildcraft/robots/ai/AIRobotRecharge.java @@ -37,14 +37,6 @@ public class AIRobotRecharge extends AIRobot { @Override public void update() { - PipeTransportPower powerProvider = (PipeTransportPower) ((DockingStation) robot.getDockingStation()).getPipe().pipe.transport; - - int amount = robot.getBattery().receiveEnergy(1000, true); - - powerProvider.requestEnergy(robot.getDockingStation().side(), amount); - - robot.getBattery().receiveEnergy(powerProvider.consumePower(robot.getDockingStation().side(), amount), false); - if (robot.getEnergy() >= EntityRobotBase.MAX_ENERGY) { terminate(); } diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index feb2b510..8ad89ad3 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -175,6 +175,17 @@ public class PipeTransportPower extends PipeTransport { } } + private Object getEnergyProvider(int side) { + ForgeDirection fs = ForgeDirection.getOrientation(side); + if (container.hasPipePluggable(fs)) { + Object pp = container.getPipePluggable(fs); + if (pp instanceof IEnergyReceiver) { + return pp; + } + } + return tiles[side]; + } + @Override public void updateEntity() { if (container.getWorldObj().isRemote) { @@ -206,31 +217,34 @@ public class PipeTransportPower extends PipeTransport { if (internalPower[i] > 0) { float totalPowerQuery = 0; for (int j = 0; j < 6; ++j) { - if (j != i && powerQuery[j] > 0) - if (tiles[j] instanceof TileGenericPipe || tiles[j] instanceof IEnergyReceiver || tiles[j] instanceof IEnergyHandler) { + if (j != i && powerQuery[j] > 0) { + Object ep = getEnergyProvider(j); + if (ep instanceof TileGenericPipe || ep instanceof IEnergyReceiver || ep instanceof IEnergyHandler) { totalPowerQuery += powerQuery[j]; } + } } for (int j = 0; j < 6; ++j) { if (j != i && powerQuery[j] > 0) { + Object ep = getEnergyProvider(j); int watts = (int) Math.floor((internalPower[i] * powerQuery[j]) / totalPowerQuery); - if (tiles[j] instanceof IPipeTile) { - Pipe nearbyPipe = (Pipe) ((IPipeTile) tiles[j]).getPipe(); + if (ep instanceof IPipeTile) { + Pipe nearbyPipe = (Pipe) ((IPipeTile) ep).getPipe(); PipeTransportPower nearbyTransport = (PipeTransportPower) nearbyPipe.transport; watts = nearbyTransport.receiveEnergy( ForgeDirection.VALID_DIRECTIONS[j].getOpposite(), watts); internalPower[i] -= watts; - } else if (tiles[j] instanceof IEnergyHandler) { - IEnergyHandler handler = (IEnergyHandler) tiles[j]; + } else if (ep instanceof IEnergyHandler) { + IEnergyHandler handler = (IEnergyHandler) ep; if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite())) { watts = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite(), watts, false); internalPower[i] -= watts; } - } else if (tiles[j] instanceof IEnergyReceiver) { - IEnergyReceiver handler = (IEnergyReceiver) tiles[j]; + } else if (ep instanceof IEnergyReceiver) { + IEnergyReceiver handler = (IEnergyReceiver) ep; if (handler.canConnectEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite())) { watts = handler.receiveEnergy(ForgeDirection.VALID_DIRECTIONS[j].getOpposite(), watts, false); @@ -265,7 +279,7 @@ public class PipeTransportPower extends PipeTransport { continue; } - TileEntity tile = tiles [dir.ordinal()]; + Object tile = getEnergyProvider(dir.ordinal()); if (tile instanceof IPipeTile && ((Pipe) ((IPipeTile) tile).getPipe()).transport instanceof PipeTransportPower) { continue; From 1f3a4ff2e6d977644fec25f2c60d8427dca02953 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 22 Feb 2015 22:35:22 +0100 Subject: [PATCH 42/67] BuildCraft 6.4.0 Beta --- build.gradle | 2 +- buildcraft_resources/changelog/6.4.0 | 14 ++++++++++++++ .../buildcraft/transport/PipeTransportPower.java | 1 - 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 buildcraft_resources/changelog/6.4.0 diff --git a/build.gradle b/build.gradle index c9c5f460..6767df40 100755 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency apply plugin: 'maven' // for uploading to a maven repo apply plugin: 'checkstyle' -version = "6.3.6" +version = "6.4.0" group= "com.mod-buildcraft" archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] diff --git a/buildcraft_resources/changelog/6.4.0 b/buildcraft_resources/changelog/6.4.0 new file mode 100644 index 00000000..4e8b8a62 --- /dev/null +++ b/buildcraft_resources/changelog/6.4.0 @@ -0,0 +1,14 @@ +Additions: +* **Robots now actually use energy.** Watch out. (hea3ven, asie) +* **Filler parameters.** You can now configure patterns in more detailed ways! [WIP] (asie) +* Additional pipe sealant recipe using slimeballs. (warlordjones) +* Massive robot pathfinding improvements. (hea3ven) +* Stripes pipe retraction with void pipes (hea3ven) +* Stripes pipes can now put on armor and items on entities. (hea3ven) +* Stripes robot. Yes. (hea3ven) + +Bugfixes: +* **All the power bugs.** (CovertJaguar, indirectly) +* [#2472] Gravestones don't drop contents when mined (asie) +* [#2469, #2456] Further crashes on pipe corruption (asie) +* Many robot bugfixes (hea3ven) diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 8ad89ad3..ae97e58a 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -258,7 +258,6 @@ public class PipeTransportPower extends PipeTransport { } } } - double highestPower = 0; for (int i = 0; i < 6; i++) { displayPower[i] = (short) ((prevDisplayPower[i] * (DISPLAY_SMOOTHING - 1.0F) + displayPower[i]) / DISPLAY_SMOOTHING); if (displayPower[i] > highestPower) { From ff60b8c8931abe6823dcfdc2ab29e54b474edd69 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 22 Feb 2015 22:45:11 +0100 Subject: [PATCH 43/67] last-minute power pipe input control bugfix --- common/buildcraft/transport/PipeTransportPower.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index ae97e58a..bbd85cfd 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -306,6 +306,9 @@ public class PipeTransportPower extends PipeTransport { int[] transferQuery = new int[6]; for (int i = 0; i < 6; ++i) { transferQuery[i] = 0; + if (!inputOpen(ForgeDirection.getOrientation(i))) { + continue; + } for (int j = 0; j < 6; ++j) { if (j != i) { transferQuery[i] += powerQuery[j]; From 9d4c8d7740dd9e18be3c37a0c8d458ced5533b94 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Mon, 23 Feb 2015 12:31:45 +0100 Subject: [PATCH 44/67] fix low/high energy stored --- .../buildcraft/core/statements/TriggerEnergy.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/common/buildcraft/core/statements/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java index 861f3f4b..741108bd 100644 --- a/common/buildcraft/core/statements/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -28,7 +28,7 @@ import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.core.utils.StringUtils; -public class TriggerEnergy extends BCStatement implements ITriggerInternal, ITriggerExternal { +public class TriggerEnergy extends BCStatement implements ITriggerExternal { private boolean high; @@ -69,18 +69,6 @@ public class TriggerEnergy extends BCStatement implements ITriggerInternal, ITri return false; } - @Override - public boolean isTriggerActive(IStatementContainer container, IStatementParameter[] parameters) { - if (container instanceof IGate) { - IGate gate = (IGate) container; - if (gate.getPipe() instanceof IEnergyHandler) { - return isTriggeredEnergyHandler((IEnergyHandler) gate.getPipe(), ForgeDirection.UNKNOWN); - } - } - - return false; - } - @Override public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer container, IStatementParameter[] parameters) { if (tile instanceof IEnergyHandler || tile instanceof IEnergyProvider || tile instanceof IEnergyReceiver) { From 0cb909cc65a783966a632cd0d9bf85934e4d55f9 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Mon, 23 Feb 2015 17:17:34 +0100 Subject: [PATCH 45/67] fix energy bug, clean up code --- .../transport/PipeTransportPower.java | 40 ++----------------- 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index bbd85cfd..77db407b 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -52,7 +52,6 @@ public class PipeTransportPower extends PipeTransport { public int[] nextPowerQuery = new int[6]; public int[] internalNextPower = new int[6]; public int maxPower = 80; - public float[] movementStage = new float[] {0, 0, 0}; private boolean needsInit = true; private TileEntity[] tiles = new TileEntity[6]; @@ -72,10 +71,6 @@ public class PipeTransportPower extends PipeTransport { for (int i = 0; i < 6; ++i) { powerQuery[i] = 0; } - - for (int i = 0; i < 3; ++i) { - movementStage[i] = (float) Math.random(); - } } @Override @@ -131,19 +126,6 @@ public class PipeTransportPower extends PipeTransport { } return tile instanceof IEnergyConnection && ((IEnergyConnection) tile).canConnectEnergy(side.getOpposite()); - // TODO: Look into this code again when the new RF API is out. - /* - if (tile instanceof IEnergyConnection && ((IEnergyConnection) tile).canConnectEnergy(side.getOpposite())) { - if (tile instanceof TileBuildCraft && !(tile instanceof IEngine)) { - // Disregard non-engine BC tiles - return false; - } - // Disregard tiles which are consumers but NOT providers - return (tile instanceof IEngine) || (tile instanceof IEnergyHandler); - } else { - // Disregard tiles which can't connect either, I guess. - return false; - }*/ } @Override @@ -189,13 +171,6 @@ public class PipeTransportPower extends PipeTransport { @Override public void updateEntity() { if (container.getWorldObj().isRemote) { - // updating movement stage. We're only carrying the movement on half - // the things. This is purely for animation purpose. - - for (int i = 0; i < 6; i += 2) { - movementStage [i / 2] = (movementStage [i / 2] + 0.01F) % 1.0F; - } - return; } @@ -224,10 +199,11 @@ public class PipeTransportPower extends PipeTransport { } } } + for (int j = 0; j < 6; ++j) { if (j != i && powerQuery[j] > 0) { Object ep = getEnergyProvider(j); - int watts = (int) Math.floor((internalPower[i] * powerQuery[j]) / totalPowerQuery); + int watts = (int) Math.floor(internalPower[i] * powerQuery[j] / totalPowerQuery); if (ep instanceof IPipeTile) { Pipe nearbyPipe = (Pipe) ((IPipeTile) ep).getPipe(); @@ -358,7 +334,7 @@ public class PipeTransportPower extends PipeTransport { int[] next = internalPower; internalPower = internalNextPower; - internalNextPower = internalPower; + internalNextPower = next; } } @@ -458,7 +434,7 @@ public class PipeTransportPower extends PipeTransport { * This can be use to provide a rough estimate of how much power is * contained in a pipe. Measured in RF. * - * Max should be around (throughput * internalPower.length * 2), ie 112 MJ for a Cobblestone Pipe. + * Max should be around (throughput * internalPower.length * 2), ie 1120 RF for a Cobblestone Pipe. * * @return RF */ @@ -473,14 +449,6 @@ public class PipeTransportPower extends PipeTransport { return amount; } - public float getPistonStage(int i) { - if (movementStage [i] < 0.5F) { - return movementStage [i] * 2; - } else { - return 1 - (movementStage [i] - 0.5F) * 2; - } - } - public int clearInstantPower() { int amount = 0; From dcccad0658d8f0d1e3d2169558f4f57d13c259f7 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Mon, 23 Feb 2015 17:44:25 +0100 Subject: [PATCH 46/67] fix cable overflow rendering, remove now-broken functions --- .../transport/PipeTransportPower.java | 44 +------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index 77db407b..daa3ff23 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -64,7 +64,6 @@ public class PipeTransportPower extends PipeTransport { private int[] internalPower = new int[6]; private int[] externalPower = new int[6]; - private int highestPower; private SafeTimeTracker tracker = new SafeTimeTracker(2 * BuildCraftCore.updateFactor); public PipeTransportPower() { @@ -234,13 +233,14 @@ public class PipeTransportPower extends PipeTransport { } } } + double highestPower = 0.0; for (int i = 0; i < 6; i++) { displayPower[i] = (short) ((prevDisplayPower[i] * (DISPLAY_SMOOTHING - 1.0F) + displayPower[i]) / DISPLAY_SMOOTHING); if (displayPower[i] > highestPower) { highestPower = displayPower[i]; } } - overload += highestPower > maxPower * 0.95 ? 1 : -1; + overload += highestPower > ((double) maxPower) * 0.95 ? 1 : -1; if (overload < 0) { overload = 0; } @@ -420,46 +420,6 @@ public class PipeTransportPower extends PipeTransport { overload = packetPower.overload ? OVERLOAD_TICKS : 0; } - /** - * This can be use to provide a rough estimate of how much power is flowing - * through a pipe. Measured in RF/t. - * - * @return RF/t - */ - public int getCurrentPowerTransferRate() { - return highestPower; - } - - /** - * This can be use to provide a rough estimate of how much power is - * contained in a pipe. Measured in RF. - * - * Max should be around (throughput * internalPower.length * 2), ie 1120 RF for a Cobblestone Pipe. - * - * @return RF - */ - public int getCurrentPowerAmount() { - int amount = 0; - for (int d : internalPower) { - amount += d; - } - for (int d : internalNextPower) { - amount += d; - } - return amount; - } - - public int clearInstantPower() { - int amount = 0; - - for (int i = 0; i < internalPower.length; ++i) { - amount += internalPower [i]; - internalPower [i] = 0; - } - - return amount; - } - public int consumePower(ForgeDirection dir, int max) { int result; From a2a0143268a55835f8d822e287ef555ed7ad15e6 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Mon, 23 Feb 2015 21:30:31 +0100 Subject: [PATCH 47/67] make BuildCraft actually have a single maximum energy per tick count --- common/buildcraft/core/TileBuildCraft.java | 19 +++++++++++++++++-- common/buildcraft/factory/TileMiningWell.java | 2 ++ common/buildcraft/factory/TileRefinery.java | 2 ++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/TileBuildCraft.java index d2eeee90..517c9c56 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/TileBuildCraft.java @@ -49,6 +49,8 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle private String owner = "[BuildCraft]"; private RFBattery battery; + private int receivedTick, extractedTick; + public String getOwner() { return owner; } @@ -71,6 +73,11 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle initialize(); init = true; } + + if (battery != null) { + receivedTick = 0; + extractedTick = 0; + } } public void initialize() { @@ -172,7 +179,11 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { if (battery != null && this.canConnectEnergy(from)) { - return battery.receiveEnergy(maxReceive, simulate); + int received = battery.receiveEnergy(maxReceive - receivedTick, simulate); + if (!simulate) { + receivedTick += received; + } + return received; } else { return 0; } @@ -184,7 +195,11 @@ public abstract class TileBuildCraft extends TileEntity implements IEnergyHandle public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { if (battery != null && this.canConnectEnergy(from)) { - return battery.extractEnergy(maxExtract, simulate); + int extracted = battery.extractEnergy(maxExtract - extractedTick, simulate); + if (!simulate) { + extractedTick += extracted; + } + return extracted; } else { return 0; } diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 9b5527a0..0d4691e0 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -37,6 +37,8 @@ public class TileMiningWell extends TileBuildCraft implements IHasWork, IPipeCon */ @Override public void updateEntity () { + super.updateEntity(); + if (worldObj.isRemote) { return; } diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index 61c92741..892d2e89 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -110,6 +110,8 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IInve @Override public void updateEntity() { + super.updateEntity(); + if (worldObj.isRemote) { simpleAnimationIterate(); return; From 66069437620441a050f36bb9296657d17f9f2202 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Mon, 23 Feb 2015 21:31:28 +0100 Subject: [PATCH 48/67] fix #2457 --- common/buildcraft/BuildCraftCore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 74b99f8c..c3c316e5 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -537,7 +537,7 @@ public class BuildCraftCore extends BuildCraftMod { actionControl = new IActionExternal[IControllable.Mode.values().length]; for (IControllable.Mode mode : IControllable.Mode.values()) { - if (mode != IControllable.Mode.Unknown) { + if (mode != IControllable.Mode.Unknown && mode != IControllable.Mode.Mode) { actionControl[mode.ordinal()] = new ActionMachineControl(mode); } } From 1d1d1ce593cb849750ea119e75ca1ce3503f541a Mon Sep 17 00:00:00 2001 From: Hea3veN Date: Mon, 23 Feb 2015 20:51:28 -0300 Subject: [PATCH 49/67] fix interface overriding an obfuscated method, fixes #2486 --- api/buildcraft/api/transport/IPipeTile.java | 2 +- common/buildcraft/robots/statements/ActionRobotGotoStation.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/buildcraft/api/transport/IPipeTile.java b/api/buildcraft/api/transport/IPipeTile.java index c8b3b4e7..87112a98 100644 --- a/api/buildcraft/api/transport/IPipeTile.java +++ b/api/buildcraft/api/transport/IPipeTile.java @@ -25,7 +25,7 @@ public interface IPipeTile extends IInjectable { PipeType getPipeType(); - World getWorldObj(); + World getWorld(); int x(); diff --git a/common/buildcraft/robots/statements/ActionRobotGotoStation.java b/common/buildcraft/robots/statements/ActionRobotGotoStation.java index 2e43c076..00abfa42 100644 --- a/common/buildcraft/robots/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/robots/statements/ActionRobotGotoStation.java @@ -52,7 +52,7 @@ public class ActionRobotGotoStation extends BCStatement implements IActionIntern } IPipeTile tile = (IPipeTile) container.getTile(); - RobotRegistry registry = RobotRegistry.getRegistry(tile.getWorldObj()); + RobotRegistry registry = RobotRegistry.getRegistry(tile.getWorld()); for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { DockingStation station = RobotUtils.getStation(tile, d); From 4ba0e26fd1834b47d1cc119bb26c62d942ab0a1a Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 24 Feb 2015 10:22:37 +0100 Subject: [PATCH 50/67] fix robots crashing upon attempt to charge if uninitialized --- common/buildcraft/robots/ItemRobot.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/buildcraft/robots/ItemRobot.java b/common/buildcraft/robots/ItemRobot.java index 5b9fd035..f2d56040 100755 --- a/common/buildcraft/robots/ItemRobot.java +++ b/common/buildcraft/robots/ItemRobot.java @@ -132,6 +132,9 @@ public class ItemRobot extends ItemBuildCraft implements IEnergyContainerItem { @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { + if (!container.hasTagCompound()) { + return 0; + } int currentEnergy = container.getTagCompound().getInteger("energy"); int energyReceived = Math.min(EntityRobotBase.MAX_ENERGY - currentEnergy, maxReceive); if (!simulate) { @@ -142,6 +145,9 @@ public class ItemRobot extends ItemBuildCraft implements IEnergyContainerItem { @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { + if (!container.hasTagCompound()) { + return 0; + } int currentEnergy = container.getTagCompound().getInteger("energy"); int energyExtracted = Math.min(currentEnergy, maxExtract); if (!simulate) { @@ -152,11 +158,17 @@ public class ItemRobot extends ItemBuildCraft implements IEnergyContainerItem { @Override public int getEnergyStored(ItemStack container) { + if (!container.hasTagCompound()) { + return 0; + } return container.getTagCompound().getInteger("energy"); } @Override public int getMaxEnergyStored(ItemStack container) { + if (!container.hasTagCompound()) { + return 0; + } return EntityRobotBase.MAX_ENERGY; } } From e7d588d28b1cefcf9b742688e66cb396cecb0ab6 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 24 Feb 2015 10:38:55 +0100 Subject: [PATCH 51/67] fix a few crash bugs related to lists and pipes --- common/buildcraft/BuildCraftEnergy.java | 5 +---- common/buildcraft/core/gui/GuiList.java | 8 ++++++-- common/buildcraft/transport/TileGenericPipe.java | 6 ++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 77c9dcd6..bf741174 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -84,8 +84,6 @@ public class BuildCraftEnergy extends BuildCraftMod { @Mod.Instance("BuildCraft|Energy") public static BuildCraftEnergy instance; - public static final int ENERGY_REMOVE_BLOCK = 25; - public static final int ENERGY_EXTRACT_ITEM = 2; public static boolean spawnOilSprings = true; public static BiomeGenOilDesert biomeOilDesert; public static BiomeGenOilOcean biomeOilOcean; @@ -232,8 +230,7 @@ public class BuildCraftEnergy extends BuildCraftMod { if (fluidRedPlasma.getBlock() == null) { blockRedPlasma = new BlockBuildcraftFluid(fluidRedPlasma, Material.water, MapColor.redColor).setFlammable( - false).setParticleColor(0.9F, 0, 0); - blockRedPlasma.setBlockName("blockRedPlasma"); + false).setParticleColor(0.9F, 0, 0);blockRedPlasma.setBlockName("blockRedPlasma"); CoreProxy.proxy.registerBlock(blockRedPlasma); fluidRedPlasma.setBlock(blockRedPlasma); } else { diff --git a/common/buildcraft/core/gui/GuiList.java b/common/buildcraft/core/gui/GuiList.java index 1a36b363..ac37b72c 100755 --- a/common/buildcraft/core/gui/GuiList.java +++ b/common/buildcraft/core/gui/GuiList.java @@ -174,14 +174,18 @@ public class GuiList extends GuiAdvancedInterface { private boolean isCarryingList() { ItemStack stack = mc.thePlayer.inventory.getItemStack(); - return stack != null && stack.getItem() != null && stack.getItem() instanceof ItemList; + return stack != null && stack.getItem() instanceof ItemList; + } + + private boolean hasListEquipped() { + return mc.thePlayer.getCurrentEquippedItem() != null && mc.thePlayer.getCurrentEquippedItem().getItem() instanceof ItemList; } @Override protected void mouseClicked(int x, int y, int b) { super.mouseClicked(x, y, b); - if (isCarryingList()) { + if (isCarryingList() || !hasListEquipped()) { return; } diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 86a3977c..643f2725 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -601,11 +601,9 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, @Override public int injectItem(ItemStack payload, boolean doAdd, ForgeDirection from, EnumColor color) { - if (!pipe.inputOpen(from)) { - return 0; - } + if (BlockGenericPipe.isValid(pipe) && pipe.transport instanceof PipeTransportItems && isPipeConnected(from) + && pipe.inputOpen(from)) { - if (BlockGenericPipe.isValid(pipe) && pipe.transport instanceof PipeTransportItems && isPipeConnected(from)) { if (doAdd) { Position itemPos = new Position(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, from.getOpposite()); itemPos.moveBackwards(0.4); From d6a750d437f610895062dc09793e76e199805ab4 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 24 Feb 2015 13:23:04 +0100 Subject: [PATCH 52/67] fix #2489, #2339 --- common/buildcraft/BuildCraftBuilders.java | 7 ++++--- common/buildcraft/core/blueprints/BptBuilderBlueprint.java | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 54f52614..0449c08d 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -431,9 +431,10 @@ public class BuildCraftBuilders extends BuildCraftMod { schemes.registerSchematicBlock(architectBlock, SchematicRotateMeta.class, new int[]{2, 5, 3, 4}, true); schemes.registerSchematicBlock(builderBlock, SchematicRotateMeta.class, new int[]{2, 5, 3, 4}, true); - schemes.registerSchematicBlock(markerBlock, SchematicWallSide.class); - schemes.registerSchematicBlock(pathMarkerBlock, SchematicWallSide.class); - schemes.registerSchematicBlock(constructionMarkerBlock, SchematicWallSide.class); + // Landmarks are often caught incorrectly, making building them counter-productive. + schemes.registerSchematicBlock(markerBlock, SchematicIgnore.class); + schemes.registerSchematicBlock(pathMarkerBlock, SchematicIgnore.class); + schemes.registerSchematicBlock(constructionMarkerBlock, SchematicIgnore.class); // Factories required to save entities in world diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index d736e57b..fc4a6af0 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -500,9 +500,7 @@ public class BptBuilderBlueprint extends BptBuilderBase { FluidStack fluidStack = fluid != null ? FluidContainerRegistry.getFluidForFilledItem(invStk) : null; boolean compatibleContainer = fluidStack != null && fluidStack.getFluid() == fluid && fluidStack.amount >= FluidContainerRegistry.BUCKET_VOLUME; - if (invStk.hasTagCompound() == reqStk.hasTagCompound() && - (!invStk.hasTagCompound() || invStk.getTagCompound().equals(reqStk.getTagCompound())) && - (StackHelper.isCraftingEquivalent(reqStk, invStk, true) || compatibleContainer)) { + if (StackHelper.isMatchingItem(reqStk, invStk, true, true) || compatibleContainer) { try { stacksUsed.add(slot.useItem(context, reqStk, slotInv)); } catch (Throwable t) { From bd2fa060636dd6f616d5433993b40e9eda56ac36 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 24 Feb 2015 14:39:23 +0100 Subject: [PATCH 53/67] add Programming Table --- .../assets/buildcraft/lang/en_US.lang | 1 + .../blocks/programmingtable_bottom.png | Bin 0 -> 387 bytes .../textures/blocks/programmingtable_side.png | Bin 0 -> 330 bytes .../textures/blocks/programmingtable_top.png | Bin 0 -> 520 bytes .../textures/gui/programming_table.png | Bin 0 -> 1387 bytes common/buildcraft/BuildCraftCore.java | 2 + common/buildcraft/BuildCraftSilicon.java | 16 +- .../recipes/ProgrammingRecipeManager.java | 50 ++++ .../buildcraft/silicon/BlockLaserTable.java | 24 +- common/buildcraft/silicon/GuiHandler.java | 16 ++ common/buildcraft/silicon/ItemLaserTable.java | 2 + .../buildcraft/silicon/ItemRedstoneBoard.java | 4 + .../silicon/TileProgrammingTable.java | 251 ++++++++++++++++++ .../boards/BoardProgrammingRecipe.java | 65 +++++ .../silicon/boards/BoardRecipe.java | 49 ---- .../boards/ImplRedstoneBoardRegistry.java | 5 + .../gui/ContainerProgrammingTable.java | 61 +++++ .../silicon/gui/GuiProgrammingTable.java | 182 +++++++++++++ 18 files changed, 660 insertions(+), 68 deletions(-) create mode 100644 buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_bottom.png create mode 100644 buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_side.png create mode 100644 buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_top.png create mode 100644 buildcraft_resources/assets/buildcraft/textures/gui/programming_table.png create mode 100644 common/buildcraft/core/recipes/ProgrammingRecipeManager.java create mode 100644 common/buildcraft/silicon/TileProgrammingTable.java create mode 100644 common/buildcraft/silicon/boards/BoardProgrammingRecipe.java delete mode 100755 common/buildcraft/silicon/boards/BoardRecipe.java create mode 100644 common/buildcraft/silicon/gui/ContainerProgrammingTable.java create mode 100644 common/buildcraft/silicon/gui/GuiProgrammingTable.java diff --git a/buildcraft_resources/assets/buildcraft/lang/en_US.lang b/buildcraft_resources/assets/buildcraft/lang/en_US.lang index 24ce8f02..991c790b 100644 --- a/buildcraft_resources/assets/buildcraft/lang/en_US.lang +++ b/buildcraft_resources/assets/buildcraft/lang/en_US.lang @@ -294,6 +294,7 @@ tile.markerBlock.name=Land Mark tile.miningWellBlock.name=Mining Well tile.pathMarkerBlock.name=Path Mark tile.plainPipeBlock.name=Mining Pipe +tile.programmingTableBlock.name=Programming Table tile.pumpBlock.name=Pump tile.refineryBlock.name=Refinery tile.requester.name=Requester diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_bottom.png b/buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..2af2fd48afa5291977e8cff1e0daed278532a4bc GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}U4T!BtE31IkjcWr!oU3W%PT4>%E!kiC@9F!&(FohB_$=r%*-q=FR!GeBrYy4CML$o$;rsb z$iu@UBqYSm%`G7zp{lAXCnu+`udl7Gt)QU5!NDObE32reXk}%kuC8uiU?3?esjRFl zEiG+kW+wdUkU7wL&H|6fVg?3oVGw3ym^DWND9B#o>FdgVpGksSS4dv`4ak`@JY5_^ zBrd1+hx0KTaFVdQ&MBb@06F<)SpWb4 literal 0 HcmV?d00001 diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_side.png b/buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_side.png new file mode 100644 index 0000000000000000000000000000000000000000..2618cb8d98df6e93cb76365c6fc13291df958ed0 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}W`IwKD+7ZfkjcWr!ph3Z#l^+M z#3U)gBPb{+Dk{p)&(FrjCLtjqARxfa%`Gb{tDvA@Wo4zLq$DIHq^_=RU|_(<$0sQ% z$;-B|(0{3=Yq3 zqyagc1s;*b3=G`DAk4@xYmNj^kiEpy*OmP~lLWUe?E&o-U3d5|@wmMG7?; z2)KOSG%?{ouWM@X`+5)c5A5t4>X*F^^$*wnD*totl=TX)P8j$l2rxvPx<1qC4j0p$ ztdH+YA{`$^d9lgneOGE;mAQK!yMJ25r|#lO|7#{D-wB)5DH7TItzFjM(wq5T^^@C< QKr0zMUHx3vIVCg!0RJykBme*a literal 0 HcmV?d00001 diff --git a/buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_top.png b/buildcraft_resources/assets/buildcraft/textures/blocks/programmingtable_top.png new file mode 100644 index 0000000000000000000000000000000000000000..1e90d4a9b66568536b9ed3ed5a17cfceb3dc89cc GIT binary patch literal 520 zcmV+j0{8uiP)0JyFT zfL>}rO^b|>d-i{W zE8{rM@e|6j%(9G_+?Cx|vnOMWF@|$qemJ`yJN>turxWLd^>R4 zMNyWW%cY=0H=hSUYyd@3;3w+3{{G_|kvRVgl+CCW0EnXKcs%BL?koKIQdXB53@UVh zyXSe!<#M~-KAfiWr)f&wNh#aYMNt$4!D6xSeV@opG}i0&U@%CMgv=tR#^W)7`Fu|L z$z<|ynlZ*0YdzLlZ#En1x9MVxJp_dRHH6V4NOy46#iac1uRx6n$QW1Zp@zzZP`oRLNnCo}A`$bcgZI)NeJ70?e@f!DxYpdJ_m&I1>K z?*S9g1N;uW1TF$C07)GmA8%=C@%Hv6>m()%{?AGdBE_!)zXFZGO&|@p0}KO~fjp)x zDR=`Y0GfaoOiLv|4$uu4fa^dt)9Nq4Ip7&E3S^K(;3;qkAav3J3-A+=1RMvx1s(vU zKp)V>upo^7V3=NG82trg0SAFUfdQZwc*O9PNF-yxJzxa*8ps41fFBuIh&~S)aflQh zKpP+f%#4h6Kr5gJZUaUj5qJWe0Nwyaz*(S{(N;%(29OGjlZR2VWQ`rE04gzD90A|Q zhS&)wdTo$DG}Bx~#F@TZv>^eopFQzX_%5GMg0_jlp#iog7T?~(F*tNB(UX=0`>&2n zHkvyX>mAp*v|73Y1nnyd-mR?HzIU*cZ?>;9oGUZGiGQ4}cZ*71Sk;^#B2MU@+4Ovf z7x!r4!1AG+Glo3*?A6PCrU^e<-*dZ8ml@w!W4$M@u4}9s+tX@Jjj8Ulk$DK)+D{&^ zcGmFv`Vy_>kEuFnW~&d#1*9nkx`Ph*n9_{4IlzT2XUme55zfWi_v-P(z&lzSsd7+| z6s8uokIdF>_)7io8DcA%DdBJNbpCm*5oJSicRjSRMP*cW!fj)OY_NJ%v0JvrS>V0L z=S#J)=?zzQUn%CwOk3kPhIvk?YH>W}&zJY#{`iL#K752#thi@iB_i6qn zM_c}1zQo&Ia7?*~%^aRu@6b?q^;Y@3 z3xj9v?$X;9CDm?5;T0!oUbfBUS7&QJ;GSQ)GG+bTu0q!(7P)WtzNI=vgc}vGQ+-Ig z!NSXODq^k4pLS=~{)o(LRLh}4&FA|njP6~z-0k$rU8WPo3q1T{t$Gi?j*^tQiwyP( z^|6x)H5Y?)H+EP)d=WUxf6?(^v50=TVkBRtM4&k$aBt{tsfwMR5kjk;_7`N?NKMLq zubh4_wZvnmi1uonpIkYBj@mZ3kXVmjf_s;!f>IUnqIjIs!kI}&FR=weH|@me*vQFp zv=tquOPeXx6$J<7uw5-au*q&>x~!vzRrjRk)(k3oARq)HR`PHsnHZB$3wicG~~*&D8F&#J548v+D~fFPbwIeQTYuyYPPVoVV_jA?1zC zLccScOb3@3Ne;Qo|AtJGBiY))p6C}UW2zH+%_ir()3%k4n&;z#0!`=u#rqFfONx%K W*!FYsa`DlL?BD>g|2aR|{=WhI#^i?p literal 0 HcmV?d00001 diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index c3c316e5..54be62ab 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -96,6 +96,7 @@ import buildcraft.core.network.PacketHandler; import buildcraft.core.proxy.CoreProxy; import buildcraft.core.recipes.AssemblyRecipeManager; import buildcraft.core.recipes.IntegrationRecipeManager; +import buildcraft.core.recipes.ProgrammingRecipeManager; import buildcraft.core.recipes.RefineryRecipeManager; import buildcraft.core.render.BlockHighlightHandler; import buildcraft.core.statements.ActionMachineControl; @@ -302,6 +303,7 @@ public class BuildCraftCore extends BuildCraftMod { BuildcraftRecipeRegistry.assemblyTable = AssemblyRecipeManager.INSTANCE; BuildcraftRecipeRegistry.integrationTable = IntegrationRecipeManager.INSTANCE; BuildcraftRecipeRegistry.refinery = RefineryRecipeManager.INSTANCE; + BuildcraftRecipeRegistry.programmingTable = ProgrammingRecipeManager.INSTANCE; BuildcraftFuelRegistry.fuel = FuelManager.INSTANCE; BuildcraftFuelRegistry.coolant = CoolantManager.INSTANCE; diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 84f80499..1fe825a2 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -96,7 +96,8 @@ import buildcraft.silicon.TileAssemblyTable; import buildcraft.silicon.TileChargingTable; import buildcraft.silicon.TileIntegrationTable; import buildcraft.silicon.TileLaser; -import buildcraft.silicon.boards.BoardRecipe; +import buildcraft.silicon.TileProgrammingTable; +import buildcraft.silicon.boards.BoardProgrammingRecipe; import buildcraft.silicon.boards.ImplRedstoneBoardRegistry; import buildcraft.silicon.network.PacketHandlerSilicon; @@ -220,6 +221,8 @@ public class BuildCraftSilicon extends BuildCraftMod { "net.minecraft.src.buildcraft.factory.TileIntegrationTable"); CoreProxy.proxy.registerTileEntity(TileChargingTable.class, "net.minecraft.src.buildcraft.factory.TileChargingTable"); + CoreProxy.proxy.registerTileEntity(TileProgrammingTable.class, + "net.minecraft.src.buildcraft.factory.TileProgrammingTable"); CoreProxy.proxy.registerTileEntity(TileZonePlan.class, "net.minecraft.src.buildcraft.commander.TileZonePlan"); CoreProxy.proxy.registerTileEntity(TileRequester.class, "net.minecraft.src.buildcraft.commander.TileRequester"); @@ -279,6 +282,15 @@ public class BuildCraftSilicon extends BuildCraftMod { 'C', new ItemStack(redstoneChipset, 1, 0), 'G', "gearGold"); + CoreProxy.proxy.addCraftingRecipe(new ItemStack(assemblyTableBlock, 1, 4), + "ORO", + "OCO", + "OGO", + 'O', Blocks.obsidian, + 'R', "dustRedstone", + 'C', Items.emerald, + 'G', "gearDiamond"); + // COMMANDER BLOCKS CoreProxy.proxy.addCraftingRecipe(new ItemStack(zonePlanBlock, 1, 0), "IRI", @@ -338,7 +350,7 @@ public class BuildCraftSilicon extends BuildCraftMod { 'R', redstoneCrystal, 'C', Chipset.DIAMOND.getStack()); - BuildcraftRecipeRegistry.assemblyTable.addRecipe(new BoardRecipe("buildcraft:redstoneBoard")); + BuildcraftRecipeRegistry.programmingTable.addRecipe(new BoardProgrammingRecipe()); BuildcraftRecipeRegistry.integrationTable.addRecipe(new RobotIntegrationRecipe("buildcraft:robotIntegration")); } diff --git a/common/buildcraft/core/recipes/ProgrammingRecipeManager.java b/common/buildcraft/core/recipes/ProgrammingRecipeManager.java new file mode 100644 index 00000000..ce568999 --- /dev/null +++ b/common/buildcraft/core/recipes/ProgrammingRecipeManager.java @@ -0,0 +1,50 @@ +package buildcraft.core.recipes; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import buildcraft.api.core.BCLog; +import buildcraft.api.recipes.IProgrammingRecipe; +import buildcraft.api.recipes.IProgrammingRecipeManager; + +public class ProgrammingRecipeManager implements IProgrammingRecipeManager { + public static final ProgrammingRecipeManager INSTANCE = new ProgrammingRecipeManager(); + private final HashMap recipes = new HashMap(); + + @Override + public void addRecipe(IProgrammingRecipe recipe) { + if (recipe == null || recipe.getId() == null) { + return; + } + + if (!recipes.containsKey(recipe.getId())) { + recipes.put(recipe.getId(), recipe); + } else { + BCLog.logger.warn("Programming Table Recipe '" + recipe.getId() + "' seems to be duplicated! This is a bug!"); + } + } + + @Override + public void removeRecipe(String id) { + recipes.remove(id); + } + + @Override + public void removeRecipe(IProgrammingRecipe recipe) { + if (recipe == null || recipe.getId() == null) { + return; + } + + recipes.remove(recipe.getId()); + } + + @Override + public Collection getRecipes() { + return Collections.unmodifiableCollection(recipes.values()); + } + + @Override + public IProgrammingRecipe getRecipe(String id) { + return recipes.get(id); + } +} diff --git a/common/buildcraft/silicon/BlockLaserTable.java b/common/buildcraft/silicon/BlockLaserTable.java index fbad553c..37cd61fd 100644 --- a/common/buildcraft/silicon/BlockLaserTable.java +++ b/common/buildcraft/silicon/BlockLaserTable.java @@ -33,8 +33,9 @@ import buildcraft.core.CreativeTabBuildCraft; import buildcraft.core.utils.Utils; public class BlockLaserTable extends BlockBuildCraft implements ILaserTargetBlock { - protected static final int TABLE_MAX = 4; + protected static final int TABLE_MAX = 5; + private static final String[] ICON_NAMES = {"assemblytable", "advworkbenchtable", "integrationtable", "chargingtable", "programmingtable"}; @SideOnly(Side.CLIENT) private IIcon[][] icons; @@ -107,6 +108,8 @@ public class BlockLaserTable extends BlockBuildCraft implements ILaserTargetBloc return new TileIntegrationTable(); case 3: return new TileChargingTable(); + case 4: + return new TileProgrammingTable(); } return null; } @@ -136,22 +139,9 @@ public class BlockLaserTable extends BlockBuildCraft implements ILaserTargetBloc icons = new IIcon[TABLE_MAX][]; for (int i = 0; i < TABLE_MAX; i++) { icons[i] = new IIcon[3]; + icons[i][0] = par1IconRegister.registerIcon("buildcraft:" + ICON_NAMES[i] + "_bottom"); + icons[i][1] = par1IconRegister.registerIcon("buildcraft:" + ICON_NAMES[i] + "_top"); + icons[i][2] = par1IconRegister.registerIcon("buildcraft:" + ICON_NAMES[i] + "_side"); } - - icons[0][0] = par1IconRegister.registerIcon("buildcraft:assemblytable_bottom"); - icons[0][1] = par1IconRegister.registerIcon("buildcraft:assemblytable_top"); - icons[0][2] = par1IconRegister.registerIcon("buildcraft:assemblytable_side"); - - icons[1][0] = par1IconRegister.registerIcon("buildcraft:advworkbenchtable_bottom"); - icons[1][1] = par1IconRegister.registerIcon("buildcraft:advworkbenchtable_top"); - icons[1][2] = par1IconRegister.registerIcon("buildcraft:advworkbenchtable_side"); - - icons[2][0] = par1IconRegister.registerIcon("buildcraft:integrationtable_bottom"); - icons[2][1] = par1IconRegister.registerIcon("buildcraft:integrationtable_top"); - icons[2][2] = par1IconRegister.registerIcon("buildcraft:integrationtable_side"); - - icons[3][0] = par1IconRegister.registerIcon("buildcraft:chargingtable_bottom"); - icons[3][1] = par1IconRegister.registerIcon("buildcraft:chargingtable_top"); - icons[3][2] = par1IconRegister.registerIcon("buildcraft:chargingtable_side"); } } diff --git a/common/buildcraft/silicon/GuiHandler.java b/common/buildcraft/silicon/GuiHandler.java index 430aa1ae..a3aef0ae 100644 --- a/common/buildcraft/silicon/GuiHandler.java +++ b/common/buildcraft/silicon/GuiHandler.java @@ -18,10 +18,12 @@ import buildcraft.silicon.gui.ContainerAdvancedCraftingTable; import buildcraft.silicon.gui.ContainerAssemblyTable; import buildcraft.silicon.gui.ContainerChargingTable; import buildcraft.silicon.gui.ContainerIntegrationTable; +import buildcraft.silicon.gui.ContainerProgrammingTable; import buildcraft.silicon.gui.GuiAdvancedCraftingTable; import buildcraft.silicon.gui.GuiAssemblyTable; import buildcraft.silicon.gui.GuiChargingTable; import buildcraft.silicon.gui.GuiIntegrationTable; +import buildcraft.silicon.gui.GuiProgrammingTable; public class GuiHandler implements IGuiHandler { @@ -63,6 +65,13 @@ public class GuiHandler implements IGuiHandler { return new GuiChargingTable(player.inventory, (TileChargingTable) tile); } + case 4: + if (!(tile instanceof TileProgrammingTable)) { + return null; + } else { + return new GuiProgrammingTable(player.inventory, (TileProgrammingTable) tile); + } + default: return null; } @@ -106,6 +115,13 @@ public class GuiHandler implements IGuiHandler { return new ContainerChargingTable(player.inventory, (TileChargingTable) tile); } + case 4: + if (!(tile instanceof TileProgrammingTable)) { + return null; + } else { + return new ContainerProgrammingTable(player.inventory, (TileProgrammingTable) tile); + } + default: return null; } diff --git a/common/buildcraft/silicon/ItemLaserTable.java b/common/buildcraft/silicon/ItemLaserTable.java index 2621007c..8beb9b5d 100644 --- a/common/buildcraft/silicon/ItemLaserTable.java +++ b/common/buildcraft/silicon/ItemLaserTable.java @@ -32,6 +32,8 @@ public class ItemLaserTable extends ItemBlockBuildCraft { return "tile.integrationTableBlock"; case 3: return "tile.chargingTableBlock"; + case 4: + return "tile.programmingTableBlock"; } return super.getUnlocalizedName(); } diff --git a/common/buildcraft/silicon/ItemRedstoneBoard.java b/common/buildcraft/silicon/ItemRedstoneBoard.java index be110620..39eaa76c 100755 --- a/common/buildcraft/silicon/ItemRedstoneBoard.java +++ b/common/buildcraft/silicon/ItemRedstoneBoard.java @@ -86,4 +86,8 @@ public class ItemRedstoneBoard extends ItemBuildCraft { itemList.add(stack.copy()); } } + + public static boolean isClean(ItemStack stack) { + return !stack.hasTagCompound() || !stack.getTagCompound().hasKey("id"); + } } diff --git a/common/buildcraft/silicon/TileProgrammingTable.java b/common/buildcraft/silicon/TileProgrammingTable.java new file mode 100644 index 00000000..671c2b17 --- /dev/null +++ b/common/buildcraft/silicon/TileProgrammingTable.java @@ -0,0 +1,251 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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; + +import java.util.List; +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.BuildCraftCore; +import buildcraft.api.recipes.BuildcraftRecipeRegistry; +import buildcraft.api.recipes.IProgrammingRecipe; +import buildcraft.core.network.CommandWriter; +import buildcraft.core.network.ICommandReceiver; +import buildcraft.core.network.PacketCommand; +import buildcraft.core.utils.StringUtils; +import buildcraft.core.utils.Utils; + +public class TileProgrammingTable extends TileLaserTableBase implements IInventory, ISidedInventory, ICommandReceiver { + public static final int WIDTH = 6; + public static final int HEIGHT = 4; + + public String currentRecipeId = ""; + public IProgrammingRecipe currentRecipe; + public List options; + public int optionId; + private boolean queuedNetworkUpdate = false; + + private void queueNetworkUpdate() { + queuedNetworkUpdate = true; + } + + @Override + public boolean canUpdate() { + return !FMLCommonHandler.instance().getEffectiveSide().isClient(); + } + + @Override + public void updateEntity() { // WARNING: run only server-side, see canUpdate() + super.updateEntity(); + + if (queuedNetworkUpdate) { + sendNetworkUpdate(); + queuedNetworkUpdate = false; + } + + if (currentRecipe == null) { + return; + } + + if (this.getStackInSlot(0) == null || !currentRecipe.canCraft(this.getStackInSlot(0))) { + findRecipe(); + + if (currentRecipe == null) { + return; + } + } + + if (optionId >= 0 && this.getStackInSlot(1) == null && getEnergy() >= currentRecipe.getEnergyCost(options.get(optionId))) { + setEnergy(0); + + if (currentRecipe.canCraft(this.getStackInSlot(0))) { + ItemStack remaining = currentRecipe.craft(this.getStackInSlot(0), options.get(optionId)); + this.setInventorySlotContents(0, null); + + if (remaining != null && remaining.stackSize > 0) { + remaining.stackSize -= Utils + .addToRandomInventoryAround(worldObj, xCoord, yCoord, zCoord, remaining); + } + + if (remaining != null && remaining.stackSize > 0) { + remaining.stackSize -= Utils.addToRandomInjectableAround(worldObj, xCoord, yCoord, zCoord, ForgeDirection.UNKNOWN, remaining); + } + + if (remaining != null && remaining.stackSize > 0) { + EntityItem entityitem = new EntityItem(worldObj, xCoord + 0.5, yCoord + 0.7, zCoord + 0.5, + remaining); + + worldObj.spawnEntityInWorld(entityitem); + } + + if (remaining != null && remaining.stackSize > 0) { + this.setInventorySlotContents(1, remaining); + } + + findRecipe(); + } + } + } + + /* IINVENTORY */ + @Override + public int getSizeInventory() { + return 2; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack stack) { + super.setInventorySlotContents(slot, stack); + + if (slot == 0) { + findRecipe(); + } + } + + @Override + public String getInventoryName() { + return StringUtils.localize("tile.programmingTableBlock.name"); + } + + @Override + public void readData(ByteBuf stream) { + super.readData(stream); + currentRecipeId = Utils.readUTF(stream); + optionId = stream.readUnsignedByte(); + updateRecipe(); + } + + @Override + public void writeData(ByteBuf stream) { + super.writeData(stream); + Utils.writeUTF(stream, currentRecipeId); + stream.writeByte(optionId); + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + if (nbt.hasKey("recipeId") && nbt.hasKey("optionId")) { + currentRecipeId = nbt.getString("recipeId"); + optionId = nbt.getInteger("optionId"); + } else { + currentRecipeId = null; + } + updateRecipe(); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + if (currentRecipeId != null) { + nbt.setString("recipeId", currentRecipeId); + nbt.setByte("optionId", (byte) optionId); + } + } + + @Override + public int getRequiredEnergy() { + if (hasWork()) { + return currentRecipe.getEnergyCost(options.get(optionId)); + } else { + return 0; + } + } + + public void findRecipe() { + String oldId = currentRecipeId; + currentRecipeId = null; + + if (getStackInSlot(0) != null) { + for (IProgrammingRecipe recipe : BuildcraftRecipeRegistry.programmingTable.getRecipes()) { + if (recipe.canCraft(getStackInSlot(0))) { + currentRecipeId = recipe.getId(); + } + } + } + + if ((oldId != null && !oldId.equals(currentRecipeId)) || (oldId == null && currentRecipeId != null)) { + optionId = -1; + updateRecipe(); + queueNetworkUpdate(); + } + } + + public void updateRecipe() { + currentRecipe = BuildcraftRecipeRegistry.programmingTable.getRecipe(currentRecipeId); + if (currentRecipe != null) { + options = currentRecipe.getOptions(WIDTH, HEIGHT); + } else { + options = null; + } + } + + public void rpcSelectOption(final int pos) { + BuildCraftCore.instance.sendToServer(new PacketCommand(this, "select", new CommandWriter() { + public void write(ByteBuf data) { + data.writeByte(pos); + } + })); + } + + @Override + public void receiveCommand(String command, Side side, Object sender, ByteBuf stream) { + if (side.isServer() && "select".equals(command)) { + optionId = stream.readUnsignedByte(); + if (optionId >= options.size()) { + optionId = 0; + } + + queueNetworkUpdate(); + } + } + + @Override + public boolean hasWork() { + return currentRecipe != null && optionId >= 0; + } + + @Override + public boolean canCraft() { + return hasWork(); + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return (slot == 0 || stack == null); + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public int[] getAccessibleSlotsFromSide(int side) { + return new int[] {0, 1}; + } + + @Override + public boolean canInsertItem(int slot, ItemStack stack, int side) { + return slot == 0; + } + + @Override + public boolean canExtractItem(int slot, ItemStack stack, int side) { + return slot == 1; + } +} diff --git a/common/buildcraft/silicon/boards/BoardProgrammingRecipe.java b/common/buildcraft/silicon/boards/BoardProgrammingRecipe.java new file mode 100644 index 00000000..08cca6d5 --- /dev/null +++ b/common/buildcraft/silicon/boards/BoardProgrammingRecipe.java @@ -0,0 +1,65 @@ +package buildcraft.silicon.boards; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import buildcraft.BuildCraftSilicon; +import buildcraft.api.boards.RedstoneBoardNBT; +import buildcraft.api.boards.RedstoneBoardRegistry; +import buildcraft.api.recipes.IProgrammingRecipe; +import buildcraft.core.utils.NBTUtils; +import buildcraft.silicon.ItemRedstoneBoard; + +/** + * Created by asie on 2/24/15. + */ +public class BoardProgrammingRecipe implements IProgrammingRecipe { + private class BoardSorter implements Comparator { + private BoardProgrammingRecipe recipe; + + public BoardSorter(BoardProgrammingRecipe recipe) { + this.recipe = recipe; + } + + @Override + public int compare(ItemStack o1, ItemStack o2) { + return recipe.getEnergyCost(o1) - recipe.getEnergyCost(o2); + } + } + + @Override + public String getId() { + return "buildcraft:redstone_board"; + } + + @Override + public List getOptions(int width, int height) { + List options = new ArrayList(width * height); + for (RedstoneBoardNBT nbt : RedstoneBoardRegistry.instance.getAllBoardNBTs()) { + ItemStack stack = new ItemStack(BuildCraftSilicon.redstoneBoard); + nbt.createBoard(NBTUtils.getItemData(stack)); + options.add(stack); + } + options.sort(new BoardSorter(this)); + return options; + } + + @Override + public int getEnergyCost(ItemStack option) { + // TODO: Replace probability with proper energy cost? (7.0.x?) + ImplRedstoneBoardRegistry impl = (ImplRedstoneBoardRegistry) RedstoneBoardRegistry.instance; + return Math.round((20.0F / impl.getProbability(option.getTagCompound().getString("id"))) * 8000); + } + + @Override + public boolean canCraft(ItemStack input) { + return (input.getItem() instanceof ItemRedstoneBoard); + } + + @Override + public ItemStack craft(ItemStack input, ItemStack option) { + return option; + } +} diff --git a/common/buildcraft/silicon/boards/BoardRecipe.java b/common/buildcraft/silicon/boards/BoardRecipe.java deleted file mode 100755 index 30b6f5ba..00000000 --- a/common/buildcraft/silicon/boards/BoardRecipe.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * 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.boards; - -import net.minecraft.item.ItemStack; - -import buildcraft.BuildCraftSilicon; -import buildcraft.api.boards.RedstoneBoardRegistry; -import buildcraft.api.recipes.CraftingResult; -import buildcraft.api.recipes.IFlexibleCrafter; -import buildcraft.core.recipes.FlexibleRecipe; -import buildcraft.core.utils.NBTUtils; - -public class BoardRecipe extends FlexibleRecipe { - - public BoardRecipe(String id) { - ItemStack output = new ItemStack(BuildCraftSilicon.redstoneBoard); - NBTUtils.getItemData(output).setString("id", ""); - - setContents(id, output, 1000, 0, new ItemStack(BuildCraftSilicon.redstoneBoard)); - } - - @Override - public CraftingResult craft(IFlexibleCrafter crafter, boolean preview) { - CraftingResult result = super.craft(crafter, preview); - - if (result != null) { - ItemStack stack = new ItemStack(BuildCraftSilicon.redstoneBoard); - RedstoneBoardRegistry.instance.createRandomBoard(NBTUtils.getItemData(stack)); - - result.crafted = stack; - - return result; - } else { - return null; - } - } - - @Override - public CraftingResult canCraft(ItemStack expectedOutput) { - return null; - } -} diff --git a/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java b/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java index 34c31a8a..95024ad7 100755 --- a/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java +++ b/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java @@ -96,4 +96,9 @@ public class ImplRedstoneBoardRegistry extends RedstoneBoardRegistry { return result; } + + // TODO: Publicize this in the abstract class (6.5.0) + public float getProbability(String id) { + return boards.get(id) != null ? boards.get(id).probability : 0; + } } diff --git a/common/buildcraft/silicon/gui/ContainerProgrammingTable.java b/common/buildcraft/silicon/gui/ContainerProgrammingTable.java new file mode 100644 index 00000000..2ea9afd6 --- /dev/null +++ b/common/buildcraft/silicon/gui/ContainerProgrammingTable.java @@ -0,0 +1,61 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.gui; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import buildcraft.core.gui.BuildCraftContainer; +import buildcraft.silicon.TileProgrammingTable; + +public class ContainerProgrammingTable extends BuildCraftContainer { + IInventory playerIInventory; + TileProgrammingTable table; + + public ContainerProgrammingTable(IInventory playerInventory, TileProgrammingTable table) { + super(table.getSizeInventory()); + this.playerIInventory = playerInventory; + + addSlotToContainer(new Slot(table, 0, 8, 36)); + addSlotToContainer(new Slot(table, 1, 8, 90)); + + for (int l = 0; l < 3; l++) { + for (int k1 = 0; k1 < 9; k1++) { + addSlotToContainer(new Slot(playerInventory, k1 + l * 9 + 9, 8 + k1 * 18, 123 + l * 18)); + } + + } + + for (int i1 = 0; i1 < 9; i1++) { + addSlotToContainer(new Slot(playerInventory, i1, 8 + i1 * 18, 181)); + } + + this.table = table; + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) { + return table.isUseableByPlayer(entityplayer); + } + + @Override + public void updateProgressBar(int i, int j) { + table.getGUINetworkData(i, j); + } + + @Override + public void detectAndSendChanges() { + super.detectAndSendChanges(); + + for (int i = 0; i < crafters.size(); i++) { + table.sendGUINetworkData(this, (ICrafting) crafters.get(i)); + } + } +} diff --git a/common/buildcraft/silicon/gui/GuiProgrammingTable.java b/common/buildcraft/silicon/gui/GuiProgrammingTable.java new file mode 100644 index 00000000..acb5809f --- /dev/null +++ b/common/buildcraft/silicon/gui/GuiProgrammingTable.java @@ -0,0 +1,182 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * 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.gui; + +import java.util.Iterator; +import java.util.List; +import org.lwjgl.opengl.GL11; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import buildcraft.BuildCraftCore; +import buildcraft.api.recipes.CraftingResult; +import buildcraft.core.CoreIconProvider; +import buildcraft.core.DefaultProps; +import buildcraft.core.gui.AdvancedSlot; +import buildcraft.core.gui.GuiAdvancedInterface; +import buildcraft.core.utils.StringUtils; +import buildcraft.silicon.TileProgrammingTable; + +public class GuiProgrammingTable extends GuiAdvancedInterface { + + private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraft", DefaultProps.TEXTURE_PATH_GUI + "/programming_table.png"); + + private class LaserTableLedger extends Ledger { + + int headerColour = 0xe1c92f; + int subheaderColour = 0xaaafb8; + int textColour = 0x000000; + + public LaserTableLedger() { + maxHeight = 94; + overlayColor = 0xd46c1f; + } + + @Override + public void draw(int x, int y) { + + // Draw background + drawBackground(x, y); + + // Draw icon + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + drawIcon(BuildCraftCore.iconProvider.getIcon(CoreIconProvider.ENERGY), x + 3, y + 4); + + if (!isFullyOpened()) { + return; + } + + fontRendererObj.drawStringWithShadow(StringUtils.localize("gui.energy"), x + 22, y + 8, headerColour); + fontRendererObj.drawStringWithShadow(StringUtils.localize("gui.assemblyCurrentRequired") + ":", x + 22, y + 20, subheaderColour); + fontRendererObj.drawString(String.format("%d RF", table.clientRequiredEnergy), x + 22, y + 32, textColour); + fontRendererObj.drawStringWithShadow(StringUtils.localize("gui.stored") + ":", x + 22, y + 44, subheaderColour); + fontRendererObj.drawString(String.format("%d RF", table.getEnergy()), x + 22, y + 56, textColour); + fontRendererObj.drawStringWithShadow(StringUtils.localize("gui.assemblyRate") + ":", x + 22, y + 68, subheaderColour); + fontRendererObj.drawString(String.format("%.1f RF/t", table.getRecentEnergyAverage() / 100.0f), x + 22, y + 80, textColour); + + } + + @Override + public String getTooltip() { + return String.format("%.1f RF/t", table.getRecentEnergyAverage() / 100.0f); + } + } + private final TileProgrammingTable table; + + class RecipeSlot extends AdvancedSlot { + public ItemStack slot; + public int id; + + public RecipeSlot(int x, int y, int i) { + super(GuiProgrammingTable.this, x, y); + id = i; + } + + @Override + public ItemStack getItemStack() { + return slot; + } + } + + public GuiProgrammingTable(IInventory playerInventory, TileProgrammingTable programmingTable) { + super(new ContainerProgrammingTable(playerInventory, programmingTable), programmingTable, TEXTURE); + + this.table = programmingTable; + xSize = 176; + ySize = 207; + + for (int j = 0; j < TileProgrammingTable.HEIGHT; ++j) { + for (int i = 0; i < TileProgrammingTable.WIDTH; ++i) { + slots.add(new RecipeSlot(43 + 18 * i, 36 + 18 * j, (j * TileProgrammingTable.WIDTH) + i)); + } + } + + updateRecipes(); + } + + public void updateRecipes() { + if (table.options != null) { + Iterator cur = table.options.iterator(); + + for (AdvancedSlot s : slots) { + if (cur.hasNext()) { + ((RecipeSlot) s).slot = cur.next(); + } else { + ((RecipeSlot) s).slot = null; + } + } + } else { + for (AdvancedSlot s : slots) { + ((RecipeSlot) s).slot = null; + } + } + } + + @Override + protected void drawGuiContainerForegroundLayer(int par1, int par2) { + super.drawGuiContainerForegroundLayer(par1, par2); + String title = StringUtils.localize("tile.programmingTableBlock.name"); + fontRendererObj.drawString(title, getCenteredOffset(title), 15, 0x404040); + fontRendererObj.drawString(StringUtils.localize("gui.inventory"), 8, ySize - 97, 0x404040); + drawTooltipForSlotAt(par1, par2); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float f, int x, int y) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.bindTexture(TEXTURE); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + updateRecipes(); + + int i = 0; + + for (AdvancedSlot slot2 : slots) { + RecipeSlot slot = (RecipeSlot) slot2; + + if (slot.slot != null) { + if (table.optionId == i) { + drawTexturedModalRect(guiLeft + slot.x, guiTop + slot.y, 196, 1, 16, 16); + } + } + i++; + } + + int h = table.getProgressScaled(70); + + drawTexturedModalRect(guiLeft + 164, guiTop + 36 + 70 - h, 176, 18, 4, h); + + drawBackgroundSlots(); + } + + @Override + protected void slotClicked(AdvancedSlot aslot, int mouseButton) { + super.slotClicked(aslot, mouseButton); + + if (aslot instanceof RecipeSlot) { + RecipeSlot slot = (RecipeSlot) aslot; + + if (slot.slot == null) { + return; + } + + table.rpcSelectOption(slot.id); + } + } + + @Override + protected void initLedgers(IInventory inventory) { + super.initLedgers(inventory); + if (!BuildCraftCore.hidePowerNumbers) { + ledgerManager.add(new LaserTableLedger()); + } + } +} From d9fa90902c0dbba1838fbbfc721cd2de64a692be Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 24 Feb 2015 16:40:30 +0100 Subject: [PATCH 54/67] fix programming table eating items, fix #2490 --- .../core/recipes/RefineryRecipeManager.java | 1 + .../buildcraft/silicon/TileProgrammingTable.java | 2 +- .../transport/PipeTriggerProvider.java | 16 ++++++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/common/buildcraft/core/recipes/RefineryRecipeManager.java b/common/buildcraft/core/recipes/RefineryRecipeManager.java index aee15af7..a83d5309 100644 --- a/common/buildcraft/core/recipes/RefineryRecipeManager.java +++ b/common/buildcraft/core/recipes/RefineryRecipeManager.java @@ -41,6 +41,7 @@ public final class RefineryRecipeManager implements IRefineryRecipeManager { FlexibleRecipe recipe = new FlexibleRecipe(id, result, energy, delay, ingredient); recipes.put(id, recipe); validFluids1.add(ingredient); + validFluids2.add(ingredient); } @Override diff --git a/common/buildcraft/silicon/TileProgrammingTable.java b/common/buildcraft/silicon/TileProgrammingTable.java index 671c2b17..144ab07f 100644 --- a/common/buildcraft/silicon/TileProgrammingTable.java +++ b/common/buildcraft/silicon/TileProgrammingTable.java @@ -72,7 +72,7 @@ public class TileProgrammingTable extends TileLaserTableBase implements IInvento if (currentRecipe.canCraft(this.getStackInSlot(0))) { ItemStack remaining = currentRecipe.craft(this.getStackInSlot(0), options.get(optionId)); - this.setInventorySlotContents(0, null); + this.decrStackSize(0, remaining.stackSize); if (remaining != null && remaining.stackSize > 0) { remaining.stackSize -= Utils diff --git a/common/buildcraft/transport/PipeTriggerProvider.java b/common/buildcraft/transport/PipeTriggerProvider.java index 65634884..c9f4aafa 100644 --- a/common/buildcraft/transport/PipeTriggerProvider.java +++ b/common/buildcraft/transport/PipeTriggerProvider.java @@ -69,18 +69,18 @@ public class PipeTriggerProvider implements ITriggerProvider { case STRUCTURE: break; } - - if (tile instanceof IEnergyHandler && ((IEnergyHandler) tile).getMaxEnergyStored(ForgeDirection.UNKNOWN) > 0 - && !(pipe instanceof PipePowerWood)) { - result.add((ITriggerInternal) BuildCraftCore.triggerEnergyHigh); - result.add((ITriggerInternal) BuildCraftCore.triggerEnergyLow); - } - return result; } @Override public LinkedList getExternalTriggers(ForgeDirection side, TileEntity tile) { - return null; + LinkedList result = new LinkedList(); + + if (tile instanceof IEnergyHandler && ((IEnergyHandler) tile).getMaxEnergyStored(side) > 0) { + result.add((ITriggerExternal) BuildCraftCore.triggerEnergyHigh); + result.add((ITriggerExternal) BuildCraftCore.triggerEnergyLow); + } + + return result; } } From 86b4a730930665431eb31e4806d1c881deab9577 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 24 Feb 2015 18:36:41 +0100 Subject: [PATCH 55/67] update API --- .../api/boards/RedstoneBoardRegistry.java | 1 + .../api/recipes/BuildcraftRecipeRegistry.java | 1 + .../api/recipes/IProgrammingRecipe.java | 14 +++++++++++ .../recipes/IProgrammingRecipeManager.java | 24 +++++++++++++++++++ api/buildcraft/api/recipes/package-info.java | 2 +- .../api/transport/package-info.java | 2 +- 6 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 api/buildcraft/api/recipes/IProgrammingRecipe.java create mode 100644 api/buildcraft/api/recipes/IProgrammingRecipeManager.java diff --git a/api/buildcraft/api/boards/RedstoneBoardRegistry.java b/api/buildcraft/api/boards/RedstoneBoardRegistry.java index 6c299bcf..57eda12c 100755 --- a/api/buildcraft/api/boards/RedstoneBoardRegistry.java +++ b/api/buildcraft/api/boards/RedstoneBoardRegistry.java @@ -19,6 +19,7 @@ public abstract class RedstoneBoardRegistry { public abstract void registerBoardClass(RedstoneBoardNBT redstoneBoardNBT, float probability); + @Deprecated public abstract void createRandomBoard(NBTTagCompound nbt); public abstract RedstoneBoardNBT getRedstoneBoard(NBTTagCompound nbt); diff --git a/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java b/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java index 57d20065..3aa945c1 100644 --- a/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java +++ b/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java @@ -13,6 +13,7 @@ public final class BuildcraftRecipeRegistry { public static IAssemblyRecipeManager assemblyTable; public static IIntegrationRecipeManager integrationTable; public static IRefineryRecipeManager refinery; + public static IProgrammingRecipeManager programmingTable; private BuildcraftRecipeRegistry() { } diff --git a/api/buildcraft/api/recipes/IProgrammingRecipe.java b/api/buildcraft/api/recipes/IProgrammingRecipe.java new file mode 100644 index 00000000..c969e067 --- /dev/null +++ b/api/buildcraft/api/recipes/IProgrammingRecipe.java @@ -0,0 +1,14 @@ +package buildcraft.api.recipes; + +import java.util.List; +import net.minecraft.item.ItemStack; + +public interface IProgrammingRecipe { + public String getId(); + + public List getOptions(int width, int height); + public int getEnergyCost(ItemStack option); + + public boolean canCraft(ItemStack input); + public ItemStack craft(ItemStack input, ItemStack option); +} diff --git a/api/buildcraft/api/recipes/IProgrammingRecipeManager.java b/api/buildcraft/api/recipes/IProgrammingRecipeManager.java new file mode 100644 index 00000000..1b7ffa53 --- /dev/null +++ b/api/buildcraft/api/recipes/IProgrammingRecipeManager.java @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. + */ +package buildcraft.api.recipes; + +import java.util.Collection; +import net.minecraft.item.ItemStack; + +public interface IProgrammingRecipeManager { + void addRecipe(IProgrammingRecipe recipe); + + void removeRecipe(String id); + + void removeRecipe(IProgrammingRecipe recipe); + + IProgrammingRecipe getRecipe(String id); + + Collection getRecipes(); +} diff --git a/api/buildcraft/api/recipes/package-info.java b/api/buildcraft/api/recipes/package-info.java index d76b2dfe..6ad3bb6f 100644 --- a/api/buildcraft/api/recipes/package-info.java +++ b/api/buildcraft/api/recipes/package-info.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes") +@API(apiVersion = "3.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes") package buildcraft.api.recipes; import cpw.mods.fml.common.API; diff --git a/api/buildcraft/api/transport/package-info.java b/api/buildcraft/api/transport/package-info.java index f4c84cb4..c91eebeb 100644 --- a/api/buildcraft/api/transport/package-info.java +++ b/api/buildcraft/api/transport/package-info.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "3.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") +@API(apiVersion = "4.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") package buildcraft.api.transport; import cpw.mods.fml.common.API; From 0c6761ee03490243df0bfe5f7051c25de93080e7 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 24 Feb 2015 18:37:35 +0100 Subject: [PATCH 56/67] fix versioning for recipes API --- api/buildcraft/api/recipes/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/buildcraft/api/recipes/package-info.java b/api/buildcraft/api/recipes/package-info.java index 6ad3bb6f..a2f9f7bf 100644 --- a/api/buildcraft/api/recipes/package-info.java +++ b/api/buildcraft/api/recipes/package-info.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "3.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes") +@API(apiVersion = "2.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes") package buildcraft.api.recipes; import cpw.mods.fml.common.API; From eb5b3a4c9bd5e7cff79c708b93896fe47d1d6048 Mon Sep 17 00:00:00 2001 From: AEnterprise Date: Wed, 25 Feb 2015 14:47:58 +0100 Subject: [PATCH 57/67] added some nullchecks, fixes #2492 --- common/buildcraft/robots/RobotStationPluggable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/buildcraft/robots/RobotStationPluggable.java b/common/buildcraft/robots/RobotStationPluggable.java index e083afd1..a6f0689c 100644 --- a/common/buildcraft/robots/RobotStationPluggable.java +++ b/common/buildcraft/robots/RobotStationPluggable.java @@ -255,7 +255,7 @@ public class RobotStationPluggable extends PipePluggable implements IPipePluggab @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if (station != null && station.isTaken()) { + if (station != null && station.isTaken() && station.robotTaking() != null && station.robotTaking().getBattery() != null) { return station.robotTaking().getBattery().receiveEnergy(maxReceive, simulate); } return 0; From 71d7d96c254102b50ea4bb77891d8993b61963a2 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 25 Feb 2015 17:39:54 +0100 Subject: [PATCH 58/67] bump minimum Forge version to 1236, add place/break events for Builder, Filler and Quarry frame building, try to fix #2476 --- common/buildcraft/BuildCraftCore.java | 2 +- common/buildcraft/BuildCraftEnergy.java | 1 - .../core/blueprints/BptBuilderBlueprint.java | 60 ++++++++++++++----- .../buildcraft/core/blueprints/BptError.java | 6 -- 4 files changed, 46 insertions(+), 23 deletions(-) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 54be62ab..a9db4513 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -186,7 +186,7 @@ import buildcraft.robots.boards.BoardRobotPump; import buildcraft.robots.boards.BoardRobotShovelman; import buildcraft.robots.boards.BoardRobotStripes; -@Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.10,1.8)", dependencies = "required-after:Forge@[10.13.0.1207,)") +@Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.10,1.8)", dependencies = "required-after:Forge@[10.13.0.1236,)") public class BuildCraftCore extends BuildCraftMod { @Mod.Instance("BuildCraft|Core") diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index bf741174..5fb7042c 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -359,7 +359,6 @@ public class BuildCraftEnergy extends BuildCraftMod { @Mod.EventHandler public void postInit(FMLPostInitializationEvent evt) { - if (BuildCraftCore.modifyWorld) { MinecraftForge.EVENT_BUS.register(OilPopulate.INSTANCE); MinecraftForge.TERRAIN_GEN_BUS.register(new BiomeInitializer()); diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index fc4a6af0..0b95288b 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -18,6 +18,7 @@ import java.util.LinkedList; import java.util.ListIterator; import java.util.Map.Entry; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -25,9 +26,13 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraft.world.WorldSettings.GameType; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -36,6 +41,7 @@ import net.minecraftforge.fluids.FluidStack; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.Schematic; import buildcraft.api.blueprints.SchematicBlock; +import buildcraft.api.blueprints.SchematicBlockBase; import buildcraft.api.blueprints.SchematicEntity; import buildcraft.api.core.BCLog; import buildcraft.api.core.BlockIndex; @@ -53,6 +59,7 @@ import buildcraft.core.builders.TileAbstractBuilder; import buildcraft.core.inventory.InventoryCopy; import buildcraft.core.inventory.InventoryIterator; import buildcraft.core.inventory.StackHelper; +import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtils; public class BptBuilderBlueprint extends BptBuilderBase { @@ -159,6 +166,7 @@ public class BptBuilderBlueprint extends BptBuilderBase { tmpExpanding.add(b); b.buildStage = 3; break; + } } else { postProcessing.add(b); @@ -277,27 +285,16 @@ public class BptBuilderBlueprint extends BptBuilderBase { if (buildList.size() != 0) { BuildingSlot slot = internalGetNextBlock(world, inv); checkDone(); - - if (slot != null) { - return slot; - } else { - return null; - } + return slot; } if (entityList.size() != 0) { BuildingSlot slot = internalGetNextEntity(world, inv); - checkDone (); - - if (slot != null) { - return slot; - } else { - return null; - } + checkDone(); + return slot; } checkDone(); - return null; } @@ -348,7 +345,8 @@ public class BptBuilderBlueprint extends BptBuilderBase { } try { - if (BlockUtils.isUnbreakableBlock(world, slot.x, slot.y, slot.z)) { + if (BlockUtils.isUnbreakableBlock(world, slot.x, slot.y, slot.z) + || isBlockBreakCanceled(world, slot.x, slot.y, slot.z)) { // if the block can't be broken, just forget this iterator iterator.remove(); @@ -383,6 +381,12 @@ public class BptBuilderBlueprint extends BptBuilderBase { } else if (!slot.schematic.doNotBuild()) { if (builder == null) { return slot; + } else if (isBlockPlaceCanceled(world, x, y, z, slot.schematic)) { + // Forge does not allow us to place a block in + // this position. + iterator.remove(); + builtLocations.add(new BlockIndex(slot.x, + slot.y, slot.z)); } else if (checkRequirements(builder, slot.schematic)) { // At this stage, regardless of the fact that the // block can actually be built or not, we'll try. @@ -426,6 +430,32 @@ public class BptBuilderBlueprint extends BptBuilderBase { return null; } + private boolean isBlockBreakCanceled(World world, int x, int y, int z) { + if (!world.isAirBlock(x, y, z)) { + BlockEvent.BreakEvent breakEvent = new BlockEvent.BreakEvent(x, y, z, world, world.getBlock(x, y, z), + world.getBlockMetadata(x, y, z), + CoreProxy.proxy.getBuildCraftPlayer((WorldServer) world).get()); + MinecraftForge.EVENT_BUS.post(breakEvent); + return breakEvent.isCanceled(); + } + return false; + } + + private boolean isBlockPlaceCanceled(World world, int x, int y, int z, SchematicBlockBase schematic) { + Block block = schematic instanceof SchematicBlock ? ((SchematicBlock) schematic).block : Blocks.stone; + int meta = schematic instanceof SchematicBlock ? ((SchematicBlock) schematic).meta : 0; + + BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent( + new BlockSnapshot(world, x, y, z, block, meta), + Blocks.air, + CoreProxy.proxy.getBuildCraftPlayer((WorldServer) world, x, y, z).get() + ); + + MinecraftForge.EVENT_BUS.post(placeEvent); + return placeEvent.isCanceled(); + } + + private BuildingSlot internalGetNextEntity(World world, TileAbstractBuilder builder) { Iterator it = entityList.iterator(); diff --git a/common/buildcraft/core/blueprints/BptError.java b/common/buildcraft/core/blueprints/BptError.java index 3a3bb990..35f2209d 100644 --- a/common/buildcraft/core/blueprints/BptError.java +++ b/common/buildcraft/core/blueprints/BptError.java @@ -11,17 +11,11 @@ package buildcraft.core.blueprints; import buildcraft.api.core.BCLog; public class BptError extends Exception { - - /** - * - */ private static final long serialVersionUID = 3579188081467555542L; public BptError(String str) { super(str); BCLog.logger.debug("BLUEPRINT ERROR:" + str); - } - } From abeb15f55b96b6b182d4c26ed485382232c92452 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Wed, 25 Feb 2015 18:18:50 +0100 Subject: [PATCH 59/67] ledger drawing speed is no longer FPS-dependent --- common/buildcraft/core/gui/GuiBuildCraft.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/common/buildcraft/core/gui/GuiBuildCraft.java b/common/buildcraft/core/gui/GuiBuildCraft.java index e72951f6..f7e48d7b 100644 --- a/common/buildcraft/core/gui/GuiBuildCraft.java +++ b/common/buildcraft/core/gui/GuiBuildCraft.java @@ -10,6 +10,7 @@ package buildcraft.core.gui; import java.util.ArrayList; import java.util.Collection; +import java.util.Date; import org.lwjgl.opengl.GL11; @@ -453,20 +454,35 @@ public abstract class GuiBuildCraft extends GuiContainer { protected int currentHeight = minHeight; private boolean open; + private long lastUpdateTime = -1; + public void update() { + if (lastUpdateTime < 0) { + lastUpdateTime = (new Date()).getTime(); + } + + long updateTime = (new Date()).getTime(); + int updateVal = (int) Math.round((updateTime - lastUpdateTime) / 8.0); + // Width if (open && currentWidth < maxWidth) { - currentWidth += 4; + currentWidth += updateVal; + currentWidth = Math.min(maxWidth, currentWidth); } else if (!open && currentWidth > minWidth) { - currentWidth -= 4; + currentWidth -= updateVal; + currentWidth = Math.max(minWidth, currentWidth); } // Height if (open && currentHeight < maxHeight) { - currentHeight += 4; + currentHeight += updateVal; + currentHeight = Math.min(maxWidth, currentHeight); } else if (!open && currentHeight > minHeight) { - currentHeight -= 4; + currentHeight -= updateVal; + currentHeight = Math.max(minHeight, currentHeight); } + + lastUpdateTime = updateTime; } public int getHeight() { From d403a0b0639d84c03c4715ff97cb6c5a20e2c9aa Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 26 Feb 2015 08:45:55 +0100 Subject: [PATCH 60/67] fix: fake players crash when you try to addChatMessage to them, fixes #2496 --- .../buildcraft/energy/TileEngineCreative.java | 19 +++++++++++-------- common/buildcraft/factory/TileQuarry.java | 3 ++- .../transport/pipes/PipePowerIron.java | 3 ++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/common/buildcraft/energy/TileEngineCreative.java b/common/buildcraft/energy/TileEngineCreative.java index e432a12a..9c772537 100644 --- a/common/buildcraft/energy/TileEngineCreative.java +++ b/common/buildcraft/energy/TileEngineCreative.java @@ -16,6 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; @@ -55,14 +56,16 @@ public class TileEngineCreative extends TileEngine { powerMode = powerMode.getNext(); energy = 0; - if (BuildCraftCore.hidePowerNumbers) { - player.addChatMessage(new ChatComponentText(String.format( - StringUtils.localize("chat.pipe.power.iron.mode.numberless"), - StringUtils.localize("chat.pipe.power.iron.level." + powerMode.maxPower)))); - } else { - player.addChatMessage(new ChatComponentText(String.format( - StringUtils.localize("chat.pipe.power.iron.mode"), - powerMode.maxPower))); + if (!(player instanceof FakePlayer)) { + if (BuildCraftCore.hidePowerNumbers) { + player.addChatMessage(new ChatComponentText(String.format( + StringUtils.localize("chat.pipe.power.iron.mode.numberless"), + StringUtils.localize("chat.pipe.power.iron.level." + powerMode.maxPower)))); + } else { + player.addChatMessage(new ChatComponentText(String.format( + StringUtils.localize("chat.pipe.power.iron.mode"), + powerMode.maxPower))); + } } sendNetworkUpdate(); diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 85c14614..44801e33 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -30,6 +30,7 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Type; +import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftFactory; @@ -835,7 +836,7 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI } } - if (placedBy != null) { + if (placedBy != null && !(placedBy instanceof FakePlayer)) { placedBy.addChatMessage(new ChatComponentText( String.format( "[BUILDCRAFT] The quarry at %d %d %d will keep %d chunks loaded", diff --git a/common/buildcraft/transport/pipes/PipePowerIron.java b/common/buildcraft/transport/pipes/PipePowerIron.java index 305ed8f9..33ffbbc1 100644 --- a/common/buildcraft/transport/pipes/PipePowerIron.java +++ b/common/buildcraft/transport/pipes/PipePowerIron.java @@ -18,6 +18,7 @@ import net.minecraft.util.ChatComponentText; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; @@ -57,7 +58,7 @@ public class PipePowerIron extends Pipe { } else { setMode(getMode().getNext()); } - if (getWorld().isRemote) { + if (getWorld().isRemote && !(player instanceof FakePlayer)) { if (BuildCraftCore.hidePowerNumbers) { player.addChatMessage(new ChatComponentText(String.format( StringUtils.localize("chat.pipe.power.iron.mode.numberless"), From 5e4f57f51d8cd024abf210ef0e8d6638215a0b65 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 26 Feb 2015 16:55:46 +0100 Subject: [PATCH 61/67] fix style --- .../api/recipes/IProgrammingRecipe.java | 33 ++++++++++++++++--- common/buildcraft/BuildCraftEnergy.java | 3 +- .../core/statements/TriggerEnergy.java | 2 -- .../silicon/TileProgrammingTable.java | 2 +- .../boards/BoardProgrammingRecipe.java | 6 +--- .../silicon/gui/GuiProgrammingTable.java | 2 -- .../transport/PipeTriggerProvider.java | 2 -- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/api/buildcraft/api/recipes/IProgrammingRecipe.java b/api/buildcraft/api/recipes/IProgrammingRecipe.java index c969e067..46fdb71e 100644 --- a/api/buildcraft/api/recipes/IProgrammingRecipe.java +++ b/api/buildcraft/api/recipes/IProgrammingRecipe.java @@ -4,11 +4,34 @@ import java.util.List; import net.minecraft.item.ItemStack; public interface IProgrammingRecipe { - public String getId(); + String getId(); - public List getOptions(int width, int height); - public int getEnergyCost(ItemStack option); + /** + * Get a list (size at least width*height) of ItemStacks representing options. + * @param width The width of the Programming Table panel. + * @param height The height of the Programming Table panel. + * @return + */ + List getOptions(int width, int height); - public boolean canCraft(ItemStack input); - public ItemStack craft(ItemStack input, ItemStack option); + /** + * Get the energy cost of a given option ItemStack. + * @param option + * @return + */ + int getEnergyCost(ItemStack option); + + /** + * @param input The input stack. + * @return Whether this recipe applies to the given input stack. + */ + boolean canCraft(ItemStack input); + + /** + * Craft the input ItemStack with the given option into an output ItemStack. + * @param input + * @param option + * @return The output ItemStack. + */ + ItemStack craft(ItemStack input, ItemStack option); } diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 5fb7042c..263e6747 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -230,7 +230,8 @@ public class BuildCraftEnergy extends BuildCraftMod { if (fluidRedPlasma.getBlock() == null) { blockRedPlasma = new BlockBuildcraftFluid(fluidRedPlasma, Material.water, MapColor.redColor).setFlammable( - false).setParticleColor(0.9F, 0, 0);blockRedPlasma.setBlockName("blockRedPlasma"); + false).setParticleColor(0.9F, 0, 0); + blockRedPlasma.setBlockName("blockRedPlasma"); CoreProxy.proxy.registerBlock(blockRedPlasma); fluidRedPlasma.setBlock(blockRedPlasma); } else { diff --git a/common/buildcraft/core/statements/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java index 741108bd..888d054e 100644 --- a/common/buildcraft/core/statements/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -21,11 +21,9 @@ import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; -import buildcraft.api.gates.IGate; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; -import buildcraft.api.statements.ITriggerInternal; import buildcraft.core.utils.StringUtils; public class TriggerEnergy extends BCStatement implements ITriggerExternal { diff --git a/common/buildcraft/silicon/TileProgrammingTable.java b/common/buildcraft/silicon/TileProgrammingTable.java index 144ab07f..654eaf2c 100644 --- a/common/buildcraft/silicon/TileProgrammingTable.java +++ b/common/buildcraft/silicon/TileProgrammingTable.java @@ -226,7 +226,7 @@ public class TileProgrammingTable extends TileLaserTableBase implements IInvento @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { - return (slot == 0 || stack == null); + return slot == 0 || stack == null; } @Override diff --git a/common/buildcraft/silicon/boards/BoardProgrammingRecipe.java b/common/buildcraft/silicon/boards/BoardProgrammingRecipe.java index 08cca6d5..dd7eca0a 100644 --- a/common/buildcraft/silicon/boards/BoardProgrammingRecipe.java +++ b/common/buildcraft/silicon/boards/BoardProgrammingRecipe.java @@ -3,7 +3,6 @@ package buildcraft.silicon.boards; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import buildcraft.BuildCraftSilicon; import buildcraft.api.boards.RedstoneBoardNBT; @@ -12,9 +11,6 @@ import buildcraft.api.recipes.IProgrammingRecipe; import buildcraft.core.utils.NBTUtils; import buildcraft.silicon.ItemRedstoneBoard; -/** - * Created by asie on 2/24/15. - */ public class BoardProgrammingRecipe implements IProgrammingRecipe { private class BoardSorter implements Comparator { private BoardProgrammingRecipe recipe; @@ -55,7 +51,7 @@ public class BoardProgrammingRecipe implements IProgrammingRecipe { @Override public boolean canCraft(ItemStack input) { - return (input.getItem() instanceof ItemRedstoneBoard); + return input.getItem() instanceof ItemRedstoneBoard; } @Override diff --git a/common/buildcraft/silicon/gui/GuiProgrammingTable.java b/common/buildcraft/silicon/gui/GuiProgrammingTable.java index acb5809f..f33070f4 100644 --- a/common/buildcraft/silicon/gui/GuiProgrammingTable.java +++ b/common/buildcraft/silicon/gui/GuiProgrammingTable.java @@ -9,7 +9,6 @@ package buildcraft.silicon.gui; import java.util.Iterator; -import java.util.List; import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; @@ -17,7 +16,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import buildcraft.BuildCraftCore; -import buildcraft.api.recipes.CraftingResult; import buildcraft.core.CoreIconProvider; import buildcraft.core.DefaultProps; import buildcraft.core.gui.AdvancedSlot; diff --git a/common/buildcraft/transport/PipeTriggerProvider.java b/common/buildcraft/transport/PipeTriggerProvider.java index c9f4aafa..c47419c5 100644 --- a/common/buildcraft/transport/PipeTriggerProvider.java +++ b/common/buildcraft/transport/PipeTriggerProvider.java @@ -21,11 +21,9 @@ import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; -import buildcraft.transport.pipes.PipePowerWood; import buildcraft.transport.statements.TriggerPipeContents; public class PipeTriggerProvider implements ITriggerProvider { - @Override public LinkedList getInternalTriggers(IStatementContainer container) { LinkedList result = new LinkedList(); From 229f064e05d883a788ef985709054c72bc725fd9 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 26 Feb 2015 16:57:49 +0100 Subject: [PATCH 62/67] update license copyright year, fix #2470 --- api/buildcraft/api/blueprints/BlueprintDeployer.java | 2 +- api/buildcraft/api/blueprints/BuilderAPI.java | 2 +- api/buildcraft/api/blueprints/BuildingPermission.java | 2 +- api/buildcraft/api/blueprints/IBuilderContext.java | 2 +- api/buildcraft/api/blueprints/ISchematicRegistry.java | 2 +- api/buildcraft/api/blueprints/ITileBuilder.java | 2 +- api/buildcraft/api/blueprints/MappingNotFoundException.java | 2 +- api/buildcraft/api/blueprints/MappingRegistry.java | 2 +- api/buildcraft/api/blueprints/Schematic.java | 2 +- api/buildcraft/api/blueprints/SchematicBlock.java | 2 +- api/buildcraft/api/blueprints/SchematicBlockBase.java | 2 +- api/buildcraft/api/blueprints/SchematicEntity.java | 2 +- api/buildcraft/api/blueprints/SchematicFactory.java | 2 +- api/buildcraft/api/blueprints/SchematicFluid.java | 2 +- api/buildcraft/api/blueprints/SchematicMask.java | 2 +- api/buildcraft/api/blueprints/SchematicTile.java | 2 +- api/buildcraft/api/blueprints/Translation.java | 2 +- api/buildcraft/api/blueprints/package-info.java | 2 +- api/buildcraft/api/boards/IRedstoneBoard.java | 2 +- api/buildcraft/api/boards/RedstoneBoardNBT.java | 2 +- api/buildcraft/api/boards/RedstoneBoardRegistry.java | 2 +- api/buildcraft/api/boards/RedstoneBoardRobot.java | 2 +- api/buildcraft/api/boards/RedstoneBoardRobotNBT.java | 2 +- api/buildcraft/api/boards/package-info.java | 2 +- api/buildcraft/api/core/BCLog.java | 4 ++-- api/buildcraft/api/core/BlockIndex.java | 2 +- api/buildcraft/api/core/BuildCraftAPI.java | 2 +- api/buildcraft/api/core/EnumColor.java | 2 +- api/buildcraft/api/core/IAreaProvider.java | 2 +- api/buildcraft/api/core/IBox.java | 2 +- api/buildcraft/api/core/ICoreProxy.java | 2 +- api/buildcraft/api/core/IIconProvider.java | 2 +- api/buildcraft/api/core/IInvSlot.java | 2 +- api/buildcraft/api/core/ISerializable.java | 2 +- api/buildcraft/api/core/IWorldProperty.java | 2 +- api/buildcraft/api/core/IZone.java | 2 +- api/buildcraft/api/core/JavaTools.java | 2 +- api/buildcraft/api/core/Position.java | 2 +- api/buildcraft/api/core/SafeTimeTracker.java | 2 +- api/buildcraft/api/core/StackKey.java | 2 +- api/buildcraft/api/core/package-info.java | 2 +- api/buildcraft/api/core/render/ICullable.java | 2 +- api/buildcraft/api/core/render/ITextureStates.java | 2 +- api/buildcraft/api/events/BlockInteractionEvent.java | 2 +- api/buildcraft/api/events/BlockPlacedDownEvent.java | 2 +- api/buildcraft/api/events/PipePlacedEvent.java | 2 +- api/buildcraft/api/events/RobotPlacementEvent.java | 2 +- api/buildcraft/api/events/package-info.java | 2 +- api/buildcraft/api/facades/FacadeType.java | 2 +- api/buildcraft/api/facades/IFacadeItem.java | 2 +- api/buildcraft/api/facades/package-info.java | 2 +- api/buildcraft/api/filler/FillerManager.java | 2 +- api/buildcraft/api/filler/IFillerPattern.java | 2 +- api/buildcraft/api/filler/IFillerRegistry.java | 2 +- api/buildcraft/api/filler/package-info.java | 2 +- api/buildcraft/api/fuels/BuildcraftFuelRegistry.java | 2 +- api/buildcraft/api/fuels/ICoolant.java | 2 +- api/buildcraft/api/fuels/ICoolantManager.java | 2 +- api/buildcraft/api/fuels/IFuel.java | 2 +- api/buildcraft/api/fuels/IFuelManager.java | 2 +- api/buildcraft/api/fuels/ISolidCoolant.java | 2 +- api/buildcraft/api/fuels/package-info.java | 2 +- api/buildcraft/api/gates/GateExpansionController.java | 2 +- api/buildcraft/api/gates/GateExpansions.java | 2 +- api/buildcraft/api/gates/IGate.java | 2 +- api/buildcraft/api/gates/IGateExpansion.java | 2 +- api/buildcraft/api/gates/package-info.java | 2 +- api/buildcraft/api/package-info.java | 2 +- api/buildcraft/api/power/IEngine.java | 2 +- api/buildcraft/api/power/ILaserTarget.java | 2 +- api/buildcraft/api/power/ILaserTargetBlock.java | 2 +- api/buildcraft/api/power/IRedstoneEngine.java | 2 +- api/buildcraft/api/power/IRedstoneEngineReceiver.java | 2 +- api/buildcraft/api/power/package-info.java | 2 +- api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java | 2 +- api/buildcraft/api/recipes/CraftingResult.java | 2 +- api/buildcraft/api/recipes/IAssemblyRecipeManager.java | 2 +- api/buildcraft/api/recipes/IFlexibleCrafter.java | 2 +- api/buildcraft/api/recipes/IFlexibleRecipe.java | 2 +- api/buildcraft/api/recipes/IFlexibleRecipeViewable.java | 2 +- api/buildcraft/api/recipes/IIntegrationRecipe.java | 2 +- api/buildcraft/api/recipes/IIntegrationRecipeManager.java | 2 +- api/buildcraft/api/recipes/IProgrammingRecipeManager.java | 2 +- api/buildcraft/api/recipes/IRefineryRecipeManager.java | 2 +- api/buildcraft/api/recipes/package-info.java | 2 +- api/buildcraft/api/robots/AIRobot.java | 2 +- api/buildcraft/api/robots/EntityRobotBase.java | 2 +- api/buildcraft/api/robots/IDockingStation.java | 2 +- api/buildcraft/api/robots/IRequestProvider.java | 2 +- api/buildcraft/api/robots/IRobotRegistry.java | 2 +- api/buildcraft/api/robots/ResourceId.java | 2 +- api/buildcraft/api/robots/RobotManager.java | 2 +- api/buildcraft/api/robots/StackRequest.java | 2 +- api/buildcraft/api/robots/package-info.java | 2 +- api/buildcraft/api/statements/ActionState.java | 2 +- api/buildcraft/api/statements/IActionExternal.java | 2 +- api/buildcraft/api/statements/IActionInternal.java | 2 +- api/buildcraft/api/statements/IActionProvider.java | 2 +- api/buildcraft/api/statements/IActionReceptor.java | 2 +- api/buildcraft/api/statements/IOverrideDefaultStatements.java | 2 +- api/buildcraft/api/statements/IStatement.java | 2 +- api/buildcraft/api/statements/IStatementContainer.java | 2 +- api/buildcraft/api/statements/IStatementParameter.java | 2 +- api/buildcraft/api/statements/ITriggerExternal.java | 2 +- api/buildcraft/api/statements/ITriggerInternal.java | 2 +- api/buildcraft/api/statements/ITriggerProvider.java | 2 +- api/buildcraft/api/statements/StatementManager.java | 2 +- api/buildcraft/api/statements/StatementMouseClick.java | 2 +- .../api/statements/StatementParameterItemStack.java | 2 +- api/buildcraft/api/statements/package-info.java | 2 +- api/buildcraft/api/tiles/IControllable.java | 2 +- api/buildcraft/api/tiles/IHasWork.java | 2 +- api/buildcraft/api/tiles/IHeatable.java | 2 +- api/buildcraft/api/tiles/package-info.java | 2 +- api/buildcraft/api/tools/IToolWrench.java | 2 +- api/buildcraft/api/tools/package-info.java | 2 +- api/buildcraft/api/transport/IPipe.java | 2 +- api/buildcraft/api/transport/IPipeConnection.java | 2 +- api/buildcraft/api/transport/IPipeTile.java | 2 +- api/buildcraft/api/transport/IStripesActivator.java | 2 +- api/buildcraft/api/transport/IStripesHandler.java | 2 +- api/buildcraft/api/transport/IStripesPipe.java | 2 +- api/buildcraft/api/transport/PipeManager.java | 2 +- api/buildcraft/api/transport/PipeWire.java | 2 +- api/buildcraft/api/transport/package-info.java | 2 +- api/buildcraft/api/transport/pluggable/PipePluggable.java | 2 +- api/cofh/api/energy/package-info.java | 2 +- api/cofh/api/package-info.java | 2 +- buildcraft_resources/LICENSE.API | 2 +- common/buildcraft/BuildCraftBuilders.java | 2 +- common/buildcraft/BuildCraftCore.java | 2 +- common/buildcraft/BuildCraftEnergy.java | 2 +- common/buildcraft/BuildCraftFactory.java | 2 +- common/buildcraft/BuildCraftMod.java | 2 +- common/buildcraft/BuildCraftSilicon.java | 2 +- common/buildcraft/BuildCraftTransport.java | 2 +- common/buildcraft/builders/BlockArchitect.java | 2 +- common/buildcraft/builders/BlockBlueprintLibrary.java | 2 +- common/buildcraft/builders/BlockBuildTool.java | 2 +- common/buildcraft/builders/BlockBuilder.java | 2 +- common/buildcraft/builders/BlockConstructionMarker.java | 2 +- common/buildcraft/builders/BlockFiller.java | 2 +- common/buildcraft/builders/BlockMarker.java | 2 +- common/buildcraft/builders/BlockPathMarker.java | 2 +- common/buildcraft/builders/BuilderProxy.java | 2 +- common/buildcraft/builders/BuilderProxyClient.java | 2 +- common/buildcraft/builders/EventHandlerBuilders.java | 2 +- common/buildcraft/builders/GuiHandler.java | 2 +- common/buildcraft/builders/ItemBlueprint.java | 2 +- common/buildcraft/builders/ItemBlueprintStandard.java | 2 +- common/buildcraft/builders/ItemBlueprintTemplate.java | 2 +- common/buildcraft/builders/ItemConstructionMarker.java | 2 +- common/buildcraft/builders/RenderArchitect.java | 2 +- common/buildcraft/builders/RenderConstructionMarker.java | 2 +- common/buildcraft/builders/RenderPathMarker.java | 2 +- common/buildcraft/builders/TileArchitect.java | 2 +- common/buildcraft/builders/TileBlueprintLibrary.java | 2 +- common/buildcraft/builders/TileBuilder.java | 2 +- common/buildcraft/builders/TileConstructionMarker.java | 2 +- common/buildcraft/builders/TileFiller.java | 2 +- common/buildcraft/builders/TileMarker.java | 2 +- common/buildcraft/builders/TilePathMarker.java | 2 +- common/buildcraft/builders/blueprints/BlueprintDatabase.java | 2 +- common/buildcraft/builders/blueprints/BlueprintId.java | 2 +- .../builders/blueprints/IBlueprintBuilderAgent.java | 2 +- common/buildcraft/builders/gui/ContainerArchitect.java | 2 +- common/buildcraft/builders/gui/ContainerBlueprintLibrary.java | 2 +- common/buildcraft/builders/gui/ContainerBuilder.java | 2 +- common/buildcraft/builders/gui/ContainerFiller.java | 2 +- common/buildcraft/builders/gui/GuiArchitect.java | 2 +- common/buildcraft/builders/gui/GuiBlueprintLibrary.java | 2 +- common/buildcraft/builders/gui/GuiBuilder.java | 2 +- common/buildcraft/builders/gui/GuiFiller.java | 2 +- common/buildcraft/builders/schematics/SchematicBed.java | 2 +- .../builders/schematics/SchematicBlockCreative.java | 2 +- common/buildcraft/builders/schematics/SchematicCactus.java | 2 +- .../buildcraft/builders/schematics/SchematicCustomStack.java | 2 +- common/buildcraft/builders/schematics/SchematicDirt.java | 2 +- common/buildcraft/builders/schematics/SchematicDoor.java | 2 +- .../buildcraft/builders/schematics/SchematicEnderChest.java | 2 +- .../buildcraft/builders/schematics/SchematicFactoryBlock.java | 2 +- .../builders/schematics/SchematicFactoryEntity.java | 2 +- .../buildcraft/builders/schematics/SchematicFactoryMask.java | 2 +- common/buildcraft/builders/schematics/SchematicFarmland.java | 2 +- common/buildcraft/builders/schematics/SchematicFire.java | 2 +- common/buildcraft/builders/schematics/SchematicGlassPane.java | 2 +- common/buildcraft/builders/schematics/SchematicGravel.java | 2 +- common/buildcraft/builders/schematics/SchematicHanging.java | 2 +- common/buildcraft/builders/schematics/SchematicIgnore.java | 2 +- .../buildcraft/builders/schematics/SchematicIgnoreMeta.java | 2 +- common/buildcraft/builders/schematics/SchematicLever.java | 2 +- common/buildcraft/builders/schematics/SchematicMinecart.java | 2 +- common/buildcraft/builders/schematics/SchematicPiston.java | 2 +- common/buildcraft/builders/schematics/SchematicPortal.java | 2 +- common/buildcraft/builders/schematics/SchematicPumpkin.java | 2 +- common/buildcraft/builders/schematics/SchematicRail.java | 2 +- .../builders/schematics/SchematicRedstoneDiode.java | 2 +- .../buildcraft/builders/schematics/SchematicRedstoneLamp.java | 2 +- .../buildcraft/builders/schematics/SchematicRedstoneWire.java | 2 +- .../buildcraft/builders/schematics/SchematicRotateMeta.java | 2 +- common/buildcraft/builders/schematics/SchematicSeeds.java | 2 +- common/buildcraft/builders/schematics/SchematicSign.java | 2 +- common/buildcraft/builders/schematics/SchematicSkull.java | 2 +- common/buildcraft/builders/schematics/SchematicStairs.java | 2 +- .../buildcraft/builders/schematics/SchematicStandalone.java | 2 +- common/buildcraft/builders/schematics/SchematicStone.java | 2 +- .../buildcraft/builders/schematics/SchematicTileCreative.java | 2 +- .../buildcraft/builders/schematics/SchematicTripWireHook.java | 2 +- common/buildcraft/builders/schematics/SchematicWallSide.java | 2 +- common/buildcraft/builders/statements/ActionFiller.java | 2 +- .../builders/statements/BuildersActionProvider.java | 2 +- common/buildcraft/builders/urbanism/AnchoredBox.java | 2 +- common/buildcraft/builders/urbanism/BlockUrbanist.java | 2 +- common/buildcraft/builders/urbanism/ContainerUrbanist.java | 2 +- common/buildcraft/builders/urbanism/EntityUrbanist.java | 2 +- common/buildcraft/builders/urbanism/GuiUrbanist.java | 2 +- common/buildcraft/builders/urbanism/TileUrbanist.java | 2 +- common/buildcraft/builders/urbanism/UrbanistTool.java | 2 +- common/buildcraft/builders/urbanism/UrbanistToolArea.java | 2 +- common/buildcraft/builders/urbanism/UrbanistToolBlock.java | 2 +- .../buildcraft/builders/urbanism/UrbanistToolBlueprint.java | 2 +- common/buildcraft/builders/urbanism/UrbanistToolErase.java | 2 +- common/buildcraft/builders/urbanism/UrbanistToolFiller.java | 2 +- common/buildcraft/builders/urbanism/UrbanistToolPath.java | 2 +- .../builders/urbanism/UrbanistToolsIconProvider.java | 2 +- common/buildcraft/commander/BlockRequester.java | 2 +- common/buildcraft/commander/BlockZonePlan.java | 2 +- common/buildcraft/commander/ContainerRequester.java | 2 +- common/buildcraft/commander/ContainerZonePlan.java | 2 +- common/buildcraft/commander/GuiRequester.java | 2 +- common/buildcraft/commander/GuiZonePlan.java | 2 +- common/buildcraft/commander/TileRequester.java | 2 +- common/buildcraft/commander/TileZonePlan.java | 2 +- common/buildcraft/compat/CompatHooks.java | 2 +- common/buildcraft/core/BCDynamicTexture.java | 2 +- common/buildcraft/core/BlockBuildCraft.java | 2 +- common/buildcraft/core/BlockScanner.java | 2 +- common/buildcraft/core/BlockSpring.java | 2 +- common/buildcraft/core/BlockWrapper.java | 2 +- common/buildcraft/core/Box.java | 2 +- common/buildcraft/core/BoxProvider.java | 2 +- common/buildcraft/core/BuildCraftConfiguration.java | 2 +- common/buildcraft/core/ChunkIndex.java | 2 +- common/buildcraft/core/CommandBuildCraft.java | 2 +- common/buildcraft/core/CoreConstants.java | 2 +- common/buildcraft/core/CoreIconProvider.java | 2 +- common/buildcraft/core/CreativeTabBuildCraft.java | 2 +- common/buildcraft/core/DefaultAreaProvider.java | 2 +- common/buildcraft/core/DefaultProps.java | 2 +- common/buildcraft/core/EntityBlock.java | 2 +- common/buildcraft/core/EntityLaser.java | 2 +- common/buildcraft/core/GuiHandler.java | 2 +- common/buildcraft/core/GuiIds.java | 2 +- common/buildcraft/core/IBoxProvider.java | 2 +- common/buildcraft/core/IBoxesProvider.java | 2 +- common/buildcraft/core/ICustomHighlight.java | 2 +- common/buildcraft/core/IDropControlInventory.java | 2 +- common/buildcraft/core/IFramePipeConnection.java | 2 +- common/buildcraft/core/IInventoryRenderer.java | 2 +- common/buildcraft/core/IItemPipe.java | 2 +- common/buildcraft/core/IMachine.java | 2 +- common/buildcraft/core/ITileBufferHolder.java | 2 +- common/buildcraft/core/InterModComms.java | 2 +- common/buildcraft/core/ItemBlockBuildCraft.java | 2 +- common/buildcraft/core/ItemBuildCraft.java | 2 +- common/buildcraft/core/ItemGear.java | 2 +- common/buildcraft/core/ItemList.java | 2 +- common/buildcraft/core/ItemMapLocation.java | 2 +- common/buildcraft/core/ItemSpring.java | 2 +- common/buildcraft/core/ItemWrench.java | 2 +- common/buildcraft/core/LaserData.java | 2 +- common/buildcraft/core/LaserKind.java | 2 +- common/buildcraft/core/SpringPopulate.java | 2 +- common/buildcraft/core/StackAtPosition.java | 2 +- common/buildcraft/core/TickHandlerCore.java | 2 +- common/buildcraft/core/TileBuffer.java | 2 +- common/buildcraft/core/TileBuildCraft.java | 2 +- common/buildcraft/core/Version.java | 2 +- common/buildcraft/core/ZoneChunk.java | 2 +- common/buildcraft/core/ZonePlan.java | 2 +- common/buildcraft/core/blueprints/Blueprint.java | 2 +- common/buildcraft/core/blueprints/BlueprintBase.java | 2 +- .../core/blueprints/BlueprintReadConfiguration.java | 2 +- common/buildcraft/core/blueprints/BptBuilderBase.java | 2 +- common/buildcraft/core/blueprints/BptBuilderBlueprint.java | 2 +- common/buildcraft/core/blueprints/BptBuilderTemplate.java | 2 +- common/buildcraft/core/blueprints/BptContext.java | 2 +- common/buildcraft/core/blueprints/BptDataStream.java | 2 +- common/buildcraft/core/blueprints/BptError.java | 2 +- common/buildcraft/core/blueprints/RealBlueprintDeployer.java | 2 +- .../buildcraft/core/blueprints/RecursiveBlueprintBuilder.java | 2 +- .../buildcraft/core/blueprints/RecursiveBlueprintReader.java | 2 +- common/buildcraft/core/blueprints/SchematicRegistry.java | 2 +- common/buildcraft/core/blueprints/Template.java | 2 +- common/buildcraft/core/builders/BuildingItem.java | 2 +- common/buildcraft/core/builders/BuildingSlot.java | 2 +- common/buildcraft/core/builders/BuildingSlotBlock.java | 2 +- common/buildcraft/core/builders/BuildingSlotEntity.java | 2 +- common/buildcraft/core/builders/BuildingSlotIterator.java | 2 +- common/buildcraft/core/builders/IBuildingItem.java | 2 +- common/buildcraft/core/builders/IBuildingItemsProvider.java | 2 +- common/buildcraft/core/builders/TileAbstractBuilder.java | 2 +- common/buildcraft/core/builders/patterns/FillerPattern.java | 2 +- common/buildcraft/core/builders/patterns/FillerRegistry.java | 2 +- common/buildcraft/core/builders/patterns/PatternBox.java | 2 +- common/buildcraft/core/builders/patterns/PatternClear.java | 2 +- common/buildcraft/core/builders/patterns/PatternCylinder.java | 2 +- common/buildcraft/core/builders/patterns/PatternFill.java | 2 +- common/buildcraft/core/builders/patterns/PatternFlatten.java | 2 +- common/buildcraft/core/builders/patterns/PatternFrame.java | 2 +- common/buildcraft/core/builders/patterns/PatternHorizon.java | 2 +- common/buildcraft/core/builders/patterns/PatternPyramid.java | 2 +- common/buildcraft/core/builders/patterns/PatternStairs.java | 2 +- common/buildcraft/core/fluids/RestrictedTank.java | 2 +- common/buildcraft/core/fluids/SingleUseTank.java | 2 +- common/buildcraft/core/fluids/Tank.java | 2 +- common/buildcraft/core/fluids/TankManager.java | 2 +- common/buildcraft/core/fluids/TankUtils.java | 2 +- common/buildcraft/core/gui/AdvancedSlot.java | 2 +- common/buildcraft/core/gui/BuildCraftContainer.java | 2 +- common/buildcraft/core/gui/ContainerList.java | 2 +- common/buildcraft/core/gui/FluidSlot.java | 2 +- common/buildcraft/core/gui/GuiAdvancedInterface.java | 2 +- common/buildcraft/core/gui/GuiBuildCraft.java | 2 +- common/buildcraft/core/gui/GuiList.java | 2 +- common/buildcraft/core/gui/GuiTools.java | 2 +- common/buildcraft/core/gui/IInventorySlot.java | 2 +- common/buildcraft/core/gui/ItemSlot.java | 2 +- common/buildcraft/core/gui/buttons/ButtonTextureSet.java | 2 +- common/buildcraft/core/gui/buttons/GuiBetterButton.java | 2 +- common/buildcraft/core/gui/buttons/GuiButtonSmall.java | 2 +- common/buildcraft/core/gui/buttons/GuiImageButton.java | 2 +- common/buildcraft/core/gui/buttons/GuiMultiButton.java | 2 +- common/buildcraft/core/gui/buttons/GuiToggleButton.java | 2 +- common/buildcraft/core/gui/buttons/GuiToggleButtonSmall.java | 2 +- .../core/gui/buttons/IButtonClickEventListener.java | 2 +- .../buildcraft/core/gui/buttons/IButtonClickEventTrigger.java | 2 +- common/buildcraft/core/gui/buttons/IButtonTextureSet.java | 2 +- common/buildcraft/core/gui/buttons/IMultiButtonState.java | 2 +- common/buildcraft/core/gui/buttons/LockButtonState.java | 2 +- common/buildcraft/core/gui/buttons/MultiButtonController.java | 2 +- .../core/gui/buttons/StandardButtonTextureSets.java | 2 +- common/buildcraft/core/gui/slots/IPhantomSlot.java | 2 +- common/buildcraft/core/gui/slots/SlotArchitect.java | 2 +- common/buildcraft/core/gui/slots/SlotBase.java | 2 +- common/buildcraft/core/gui/slots/SlotBlueprintLibrary.java | 2 +- common/buildcraft/core/gui/slots/SlotHidden.java | 2 +- common/buildcraft/core/gui/slots/SlotLimited.java | 2 +- common/buildcraft/core/gui/slots/SlotOutput.java | 2 +- common/buildcraft/core/gui/slots/SlotPhantom.java | 2 +- common/buildcraft/core/gui/slots/SlotUntouchable.java | 2 +- common/buildcraft/core/gui/slots/SlotValidated.java | 2 +- common/buildcraft/core/gui/slots/SlotWorkbench.java | 2 +- common/buildcraft/core/gui/tooltips/IToolTipProvider.java | 2 +- common/buildcraft/core/gui/tooltips/ToolTip.java | 2 +- common/buildcraft/core/gui/tooltips/ToolTipLine.java | 2 +- common/buildcraft/core/gui/widgets/ButtonWidget.java | 2 +- common/buildcraft/core/gui/widgets/FluidGaugeWidget.java | 2 +- common/buildcraft/core/gui/widgets/IIndicatorController.java | 2 +- common/buildcraft/core/gui/widgets/IndicatorController.java | 2 +- common/buildcraft/core/gui/widgets/IndicatorWidget.java | 2 +- common/buildcraft/core/gui/widgets/Widget.java | 2 +- common/buildcraft/core/inventory/CrafterCopy.java | 2 +- common/buildcraft/core/inventory/FluidHandlerCopy.java | 2 +- common/buildcraft/core/inventory/ITransactor.java | 2 +- common/buildcraft/core/inventory/InvUtils.java | 2 +- common/buildcraft/core/inventory/InventoryConcatenator.java | 2 +- common/buildcraft/core/inventory/InventoryCopy.java | 2 +- common/buildcraft/core/inventory/InventoryIterator.java | 2 +- common/buildcraft/core/inventory/InventoryIteratorSided.java | 2 +- common/buildcraft/core/inventory/InventoryIteratorSimple.java | 2 +- common/buildcraft/core/inventory/InventoryMapper.java | 2 +- common/buildcraft/core/inventory/InventoryWrapper.java | 2 +- common/buildcraft/core/inventory/InventoryWrapperSimple.java | 2 +- common/buildcraft/core/inventory/SimpleInventory.java | 2 +- common/buildcraft/core/inventory/StackHelper.java | 2 +- common/buildcraft/core/inventory/Transactor.java | 2 +- common/buildcraft/core/inventory/TransactorRoundRobin.java | 2 +- common/buildcraft/core/inventory/TransactorSimple.java | 2 +- common/buildcraft/core/inventory/filters/AggregateFilter.java | 2 +- .../buildcraft/core/inventory/filters/ArrayFluidFilter.java | 2 +- .../buildcraft/core/inventory/filters/ArrayStackFilter.java | 2 +- .../core/inventory/filters/ArrayStackOrListFilter.java | 2 +- common/buildcraft/core/inventory/filters/CompositeFilter.java | 2 +- common/buildcraft/core/inventory/filters/CraftingFilter.java | 2 +- common/buildcraft/core/inventory/filters/IFluidFilter.java | 2 +- common/buildcraft/core/inventory/filters/IStackFilter.java | 2 +- .../core/inventory/filters/InvertedStackFilter.java | 2 +- common/buildcraft/core/inventory/filters/OreStackFilter.java | 2 +- .../core/inventory/filters/PassThroughFluidFilter.java | 2 +- .../core/inventory/filters/PassThroughStackFilter.java | 2 +- .../buildcraft/core/inventory/filters/SimpleFluidFilter.java | 2 +- common/buildcraft/core/inventory/filters/StackFilter.java | 2 +- .../core/inventory/filters/StatementParameterStackFilter.java | 2 +- common/buildcraft/core/network/BuildCraftChannelHandler.java | 2 +- common/buildcraft/core/network/BuildCraftPacket.java | 2 +- common/buildcraft/core/network/CommandTarget.java | 2 +- common/buildcraft/core/network/CommandTargetContainer.java | 2 +- common/buildcraft/core/network/CommandTargetEntity.java | 2 +- common/buildcraft/core/network/CommandTargetTile.java | 2 +- common/buildcraft/core/network/CommandWriter.java | 2 +- common/buildcraft/core/network/EntityIds.java | 2 +- common/buildcraft/core/network/ICommandReceiver.java | 2 +- common/buildcraft/core/network/IGuiReturnHandler.java | 2 +- common/buildcraft/core/network/ISyncedTile.java | 2 +- common/buildcraft/core/network/ISynchronizedTile.java | 2 +- common/buildcraft/core/network/PacketCommand.java | 2 +- common/buildcraft/core/network/PacketCoordinates.java | 2 +- common/buildcraft/core/network/PacketGuiReturn.java | 2 +- common/buildcraft/core/network/PacketGuiWidget.java | 2 +- common/buildcraft/core/network/PacketHandler.java | 2 +- common/buildcraft/core/network/PacketIds.java | 2 +- common/buildcraft/core/network/PacketNBT.java | 2 +- common/buildcraft/core/network/PacketSlotChange.java | 2 +- common/buildcraft/core/network/PacketTileState.java | 2 +- common/buildcraft/core/network/PacketTileUpdate.java | 2 +- common/buildcraft/core/network/PacketUpdate.java | 2 +- common/buildcraft/core/proxy/CoreProxy.java | 2 +- common/buildcraft/core/proxy/CoreProxyClient.java | 2 +- common/buildcraft/core/recipes/AssemblyRecipeManager.java | 2 +- common/buildcraft/core/recipes/FlexibleRecipe.java | 2 +- common/buildcraft/core/recipes/IntegrationRecipeManager.java | 2 +- common/buildcraft/core/recipes/RefineryRecipeManager.java | 2 +- common/buildcraft/core/render/BlockHighlightHandler.java | 2 +- common/buildcraft/core/render/FluidRenderer.java | 2 +- common/buildcraft/core/render/RenderBox.java | 2 +- common/buildcraft/core/render/RenderBoxProvider.java | 2 +- common/buildcraft/core/render/RenderBuilder.java | 2 +- common/buildcraft/core/render/RenderBuildingItems.java | 2 +- common/buildcraft/core/render/RenderEntityBlock.java | 2 +- common/buildcraft/core/render/RenderLaser.java | 2 +- common/buildcraft/core/render/RenderUtils.java | 2 +- common/buildcraft/core/render/RenderVoid.java | 2 +- common/buildcraft/core/render/RenderingEntityBlocks.java | 2 +- common/buildcraft/core/render/RenderingMarkers.java | 2 +- common/buildcraft/core/statements/ActionMachineControl.java | 2 +- common/buildcraft/core/statements/ActionRedstoneOutput.java | 2 +- common/buildcraft/core/statements/BCStatement.java | 2 +- common/buildcraft/core/statements/DefaultActionProvider.java | 2 +- common/buildcraft/core/statements/DefaultTriggerProvider.java | 2 +- .../core/statements/StatementParameterDirection.java | 2 +- common/buildcraft/core/statements/TriggerEnergy.java | 2 +- common/buildcraft/core/statements/TriggerFluidContainer.java | 2 +- .../core/statements/TriggerFluidContainerLevel.java | 2 +- common/buildcraft/core/statements/TriggerInventory.java | 2 +- common/buildcraft/core/statements/TriggerInventoryLevel.java | 2 +- common/buildcraft/core/statements/TriggerMachine.java | 2 +- common/buildcraft/core/statements/TriggerRedstoneInput.java | 2 +- common/buildcraft/core/utils/AverageUtil.java | 2 +- common/buildcraft/core/utils/BlockUtils.java | 2 +- common/buildcraft/core/utils/ChunkProperty.java | 2 +- common/buildcraft/core/utils/ColorUtils.java | 2 +- common/buildcraft/core/utils/ConfigUtils.java | 2 +- common/buildcraft/core/utils/CraftingHandler.java | 2 +- common/buildcraft/core/utils/CraftingHelper.java | 2 +- common/buildcraft/core/utils/DimensionProperty.java | 2 +- common/buildcraft/core/utils/IBlockFilter.java | 2 +- common/buildcraft/core/utils/IEntityFilter.java | 2 +- common/buildcraft/core/utils/INBTTagable.java | 2 +- common/buildcraft/core/utils/MathUtils.java | 2 +- common/buildcraft/core/utils/MatrixTranformations.java | 2 +- common/buildcraft/core/utils/NBTUtils.java | 2 +- common/buildcraft/core/utils/RevolvingList.java | 2 +- common/buildcraft/core/utils/SessionVars.java | 2 +- common/buildcraft/core/utils/StringUtils.java | 2 +- common/buildcraft/core/utils/Utils.java | 2 +- common/buildcraft/core/utils/WorldProperty.java | 2 +- common/buildcraft/core/utils/WorldPropertyIsDirt.java | 2 +- common/buildcraft/core/utils/WorldPropertyIsFarmland.java | 2 +- common/buildcraft/core/utils/WorldPropertyIsFluidSource.java | 2 +- common/buildcraft/core/utils/WorldPropertyIsHarvestable.java | 2 +- common/buildcraft/core/utils/WorldPropertyIsLeaf.java | 2 +- common/buildcraft/core/utils/WorldPropertyIsOre.java | 2 +- common/buildcraft/core/utils/WorldPropertyIsShoveled.java | 2 +- common/buildcraft/core/utils/WorldPropertyIsSoft.java | 2 +- common/buildcraft/core/utils/WorldPropertyIsWood.java | 2 +- .../buildcraft/core/utils/concurrency/IIterableAlgorithm.java | 2 +- .../core/utils/concurrency/IterableAlgorithmRunner.java | 2 +- common/buildcraft/core/utils/concurrency/PathFinding.java | 2 +- .../buildcraft/core/utils/concurrency/PathFindingSearch.java | 2 +- common/buildcraft/energy/BlockBuildcraftFluid.java | 2 +- common/buildcraft/energy/BlockEnergyEmitter.java | 2 +- common/buildcraft/energy/BlockEnergyReceiver.java | 2 +- common/buildcraft/energy/BlockEngine.java | 2 +- common/buildcraft/energy/BucketHandler.java | 2 +- common/buildcraft/energy/EnergyProxy.java | 2 +- common/buildcraft/energy/EnergyProxyClient.java | 2 +- common/buildcraft/energy/GuiHandler.java | 2 +- common/buildcraft/energy/ItemBucketBuildcraft.java | 2 +- common/buildcraft/energy/ItemEngine.java | 2 +- common/buildcraft/energy/SchematicEngine.java | 2 +- common/buildcraft/energy/TileEnergyEmitter.java | 2 +- common/buildcraft/energy/TileEnergyReceiver.java | 2 +- common/buildcraft/energy/TileEngine.java | 2 +- common/buildcraft/energy/TileEngineCreative.java | 2 +- common/buildcraft/energy/TileEngineIron.java | 2 +- common/buildcraft/energy/TileEngineStone.java | 2 +- common/buildcraft/energy/TileEngineWithInventory.java | 2 +- common/buildcraft/energy/TileEngineWood.java | 2 +- common/buildcraft/energy/fuels/CoolantManager.java | 2 +- common/buildcraft/energy/fuels/FuelManager.java | 2 +- common/buildcraft/energy/gui/ContainerEngine.java | 2 +- common/buildcraft/energy/gui/GuiCombustionEngine.java | 2 +- common/buildcraft/energy/gui/GuiEngine.java | 2 +- common/buildcraft/energy/gui/GuiStoneEngine.java | 2 +- common/buildcraft/energy/render/EntityDropParticleFX.java | 2 +- common/buildcraft/energy/render/RenderEnergyEmitter.java | 2 +- common/buildcraft/energy/render/RenderEngine.java | 2 +- .../buildcraft/energy/statements/EnergyStatementProvider.java | 2 +- common/buildcraft/energy/statements/TriggerEngineHeat.java | 2 +- common/buildcraft/energy/worldgen/BiomeGenOilDesert.java | 2 +- common/buildcraft/energy/worldgen/BiomeGenOilOcean.java | 2 +- common/buildcraft/energy/worldgen/BiomeInitializer.java | 2 +- common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java | 2 +- common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java | 2 +- common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java | 2 +- common/buildcraft/energy/worldgen/OilPopulate.java | 2 +- common/buildcraft/energy/worldgen/SimplexNoise.java | 2 +- common/buildcraft/factory/BlockAutoWorkbench.java | 2 +- common/buildcraft/factory/BlockFloodGate.java | 2 +- common/buildcraft/factory/BlockFrame.java | 2 +- common/buildcraft/factory/BlockHopper.java | 2 +- common/buildcraft/factory/BlockMiningWell.java | 2 +- common/buildcraft/factory/BlockPlainPipe.java | 2 +- common/buildcraft/factory/BlockPump.java | 2 +- common/buildcraft/factory/BlockQuarry.java | 2 +- common/buildcraft/factory/BlockRefinery.java | 2 +- common/buildcraft/factory/BlockTank.java | 2 +- common/buildcraft/factory/EntityMechanicalArm.java | 2 +- common/buildcraft/factory/FactoryProxy.java | 2 +- common/buildcraft/factory/FactoryProxyClient.java | 2 +- common/buildcraft/factory/GuiHandler.java | 2 +- common/buildcraft/factory/PumpDimensionList.java | 2 +- common/buildcraft/factory/TileAutoWorkbench.java | 2 +- common/buildcraft/factory/TileFloodGate.java | 2 +- common/buildcraft/factory/TileHopper.java | 2 +- common/buildcraft/factory/TileMiningWell.java | 2 +- common/buildcraft/factory/TilePump.java | 2 +- common/buildcraft/factory/TileQuarry.java | 2 +- common/buildcraft/factory/TileRefinery.java | 2 +- common/buildcraft/factory/TileTank.java | 2 +- common/buildcraft/factory/gui/ContainerAutoWorkbench.java | 2 +- common/buildcraft/factory/gui/ContainerHopper.java | 2 +- common/buildcraft/factory/gui/ContainerRefinery.java | 2 +- common/buildcraft/factory/gui/GuiAutoCrafting.java | 2 +- common/buildcraft/factory/gui/GuiHopper.java | 2 +- common/buildcraft/factory/gui/GuiRefinery.java | 2 +- common/buildcraft/factory/network/PacketHandlerFactory.java | 2 +- common/buildcraft/factory/render/ModelFrustum.java | 2 +- common/buildcraft/factory/render/RenderHopper.java | 2 +- common/buildcraft/factory/render/RenderRefinery.java | 2 +- common/buildcraft/factory/render/RenderTank.java | 2 +- .../buildcraft/factory/schematics/SchematicAutoWorkbench.java | 2 +- common/buildcraft/factory/schematics/SchematicPump.java | 2 +- common/buildcraft/factory/schematics/SchematicRefinery.java | 2 +- .../factory/schematics/SchematicTileIgnoreState.java | 2 +- common/buildcraft/robots/DockingStation.java | 2 +- common/buildcraft/robots/EntityRobot.java | 2 +- common/buildcraft/robots/EntityRobotEnergyParticle.java | 2 +- common/buildcraft/robots/IStationFilter.java | 2 +- common/buildcraft/robots/ItemRobot.java | 2 +- common/buildcraft/robots/ItemRobotStation.java | 2 +- common/buildcraft/robots/ResourceIdAssemblyTable.java | 2 +- common/buildcraft/robots/ResourceIdBlock.java | 2 +- common/buildcraft/robots/ResourceIdRequest.java | 2 +- common/buildcraft/robots/RobotIntegrationRecipe.java | 2 +- common/buildcraft/robots/RobotRegistry.java | 2 +- common/buildcraft/robots/StationIndex.java | 2 +- common/buildcraft/robots/ai/AIRobotAttack.java | 2 +- common/buildcraft/robots/ai/AIRobotBreak.java | 2 +- common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java | 2 +- common/buildcraft/robots/ai/AIRobotCraftFurnace.java | 2 +- common/buildcraft/robots/ai/AIRobotCraftGeneric.java | 2 +- common/buildcraft/robots/ai/AIRobotCraftWorkbench.java | 2 +- common/buildcraft/robots/ai/AIRobotDeliverRequested.java | 2 +- common/buildcraft/robots/ai/AIRobotDisposeItems.java | 2 +- .../buildcraft/robots/ai/AIRobotFetchAndEquipItemStack.java | 2 +- common/buildcraft/robots/ai/AIRobotFetchItem.java | 2 +- common/buildcraft/robots/ai/AIRobotGoAndLinkToDock.java | 2 +- common/buildcraft/robots/ai/AIRobotGoto.java | 2 +- common/buildcraft/robots/ai/AIRobotGotoBlock.java | 2 +- common/buildcraft/robots/ai/AIRobotGotoSleep.java | 2 +- common/buildcraft/robots/ai/AIRobotGotoStation.java | 2 +- common/buildcraft/robots/ai/AIRobotGotoStationAndLoad.java | 2 +- .../buildcraft/robots/ai/AIRobotGotoStationAndLoadFluids.java | 2 +- common/buildcraft/robots/ai/AIRobotGotoStationAndUnload.java | 2 +- .../robots/ai/AIRobotGotoStationAndUnloadFluids.java | 2 +- common/buildcraft/robots/ai/AIRobotGotoStationToLoad.java | 2 +- .../buildcraft/robots/ai/AIRobotGotoStationToLoadFluids.java | 2 +- common/buildcraft/robots/ai/AIRobotGotoStationToUnload.java | 2 +- .../robots/ai/AIRobotGotoStationToUnloadFluids.java | 2 +- common/buildcraft/robots/ai/AIRobotLoad.java | 2 +- common/buildcraft/robots/ai/AIRobotLoadFluids.java | 2 +- common/buildcraft/robots/ai/AIRobotMain.java | 2 +- common/buildcraft/robots/ai/AIRobotPumpBlock.java | 2 +- common/buildcraft/robots/ai/AIRobotRecharge.java | 2 +- common/buildcraft/robots/ai/AIRobotSearchAndGotoStation.java | 2 +- common/buildcraft/robots/ai/AIRobotSearchBlock.java | 2 +- common/buildcraft/robots/ai/AIRobotSearchEntity.java | 2 +- common/buildcraft/robots/ai/AIRobotSearchRandomBlock.java | 2 +- .../buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java | 2 +- common/buildcraft/robots/ai/AIRobotSearchStackRequest.java | 2 +- common/buildcraft/robots/ai/AIRobotSearchStation.java | 2 +- common/buildcraft/robots/ai/AIRobotSleep.java | 2 +- common/buildcraft/robots/ai/AIRobotStraightMoveTo.java | 2 +- common/buildcraft/robots/ai/AIRobotStripesHandler.java | 2 +- common/buildcraft/robots/ai/AIRobotUnload.java | 2 +- common/buildcraft/robots/ai/AIRobotUnloadFluids.java | 2 +- common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java | 2 +- common/buildcraft/robots/boards/BoardRobotBomber.java | 2 +- common/buildcraft/robots/boards/BoardRobotBomberNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotBuilder.java | 2 +- common/buildcraft/robots/boards/BoardRobotBuilderNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotButcher.java | 2 +- common/buildcraft/robots/boards/BoardRobotButcherNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotCarrier.java | 2 +- common/buildcraft/robots/boards/BoardRobotCarrierNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotCrafter.java | 2 +- common/buildcraft/robots/boards/BoardRobotCrafterNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotDelivery.java | 2 +- common/buildcraft/robots/boards/BoardRobotDeliveryNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotFarmer.java | 2 +- common/buildcraft/robots/boards/BoardRobotFarmerNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotFluidCarrier.java | 2 +- .../buildcraft/robots/boards/BoardRobotFluidCarrierNBT.java | 2 +- .../buildcraft/robots/boards/BoardRobotGenericBreakBlock.java | 2 +- common/buildcraft/robots/boards/BoardRobotHarvester.java | 2 +- common/buildcraft/robots/boards/BoardRobotHarvesterNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotKnight.java | 2 +- common/buildcraft/robots/boards/BoardRobotKnightNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotLeaveCutter.java | 2 +- common/buildcraft/robots/boards/BoardRobotLeaveCutterNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotLumberjack.java | 2 +- common/buildcraft/robots/boards/BoardRobotLumberjackNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotMiner.java | 2 +- common/buildcraft/robots/boards/BoardRobotMinerNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotPicker.java | 2 +- common/buildcraft/robots/boards/BoardRobotPickerNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotPlanter.java | 2 +- common/buildcraft/robots/boards/BoardRobotPlanterNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotPump.java | 2 +- common/buildcraft/robots/boards/BoardRobotPumpNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotShovelman.java | 2 +- common/buildcraft/robots/boards/BoardRobotShovelmanNBT.java | 2 +- common/buildcraft/robots/boards/BoardRobotStripes.java | 2 +- common/buildcraft/robots/boards/BoardRobotStripesNBT.java | 2 +- common/buildcraft/robots/render/RenderRobot.java | 2 +- common/buildcraft/robots/statements/ActionRobotFilter.java | 2 +- .../buildcraft/robots/statements/ActionRobotFilterTool.java | 2 +- .../buildcraft/robots/statements/ActionRobotGotoStation.java | 2 +- common/buildcraft/robots/statements/ActionRobotWakeUp.java | 2 +- .../buildcraft/robots/statements/ActionRobotWorkInArea.java | 2 +- .../robots/statements/ActionStationAcceptFluids.java | 2 +- .../robots/statements/ActionStationAcceptItemsInv.java | 2 +- .../robots/statements/ActionStationAcceptItemsPipe.java | 2 +- .../buildcraft/robots/statements/ActionStationAllowCraft.java | 2 +- .../robots/statements/ActionStationForbidRobot.java | 2 +- .../buildcraft/robots/statements/ActionStationInputItems.java | 2 +- .../robots/statements/ActionStationProvideFluids.java | 2 +- .../robots/statements/ActionStationProvideItems.java | 2 +- .../robots/statements/ActionStationRequestItems.java | 2 +- .../robots/statements/ActionStationRequestItemsMachine.java | 2 +- common/buildcraft/robots/statements/RobotsActionProvider.java | 2 +- .../buildcraft/robots/statements/RobotsTriggerProvider.java | 2 +- .../robots/statements/StateStationProvideItems.java | 2 +- .../robots/statements/StateStationRequestItems.java | 2 +- common/buildcraft/robots/statements/TriggerRobotSleep.java | 2 +- common/buildcraft/silicon/BlockLaser.java | 2 +- common/buildcraft/silicon/BlockLaserTable.java | 2 +- common/buildcraft/silicon/GuiHandler.java | 2 +- common/buildcraft/silicon/ItemLaserTable.java | 2 +- common/buildcraft/silicon/ItemRedstoneBoard.java | 2 +- common/buildcraft/silicon/ItemRedstoneChipset.java | 2 +- common/buildcraft/silicon/SiliconProxy.java | 2 +- common/buildcraft/silicon/SiliconProxyClient.java | 2 +- common/buildcraft/silicon/SiliconRenderBlock.java | 2 +- common/buildcraft/silicon/TileAdvancedCraftingTable.java | 2 +- common/buildcraft/silicon/TileAssemblyTable.java | 2 +- common/buildcraft/silicon/TileIntegrationTable.java | 2 +- common/buildcraft/silicon/TileLaser.java | 2 +- common/buildcraft/silicon/TileLaserTableBase.java | 2 +- common/buildcraft/silicon/TileProgrammingTable.java | 2 +- .../buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java | 2 +- .../silicon/gui/ContainerAdvancedCraftingTable.java | 2 +- common/buildcraft/silicon/gui/ContainerAssemblyTable.java | 2 +- common/buildcraft/silicon/gui/ContainerChargingTable.java | 2 +- common/buildcraft/silicon/gui/ContainerIntegrationTable.java | 2 +- common/buildcraft/silicon/gui/ContainerProgrammingTable.java | 2 +- common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java | 2 +- common/buildcraft/silicon/gui/GuiAssemblyTable.java | 2 +- common/buildcraft/silicon/gui/GuiChargingTable.java | 2 +- common/buildcraft/silicon/gui/GuiIntegrationTable.java | 2 +- common/buildcraft/silicon/gui/GuiLaserTable.java | 2 +- common/buildcraft/silicon/gui/GuiProgrammingTable.java | 2 +- common/buildcraft/silicon/network/PacketHandlerSilicon.java | 2 +- common/buildcraft/silicon/render/RenderLaserBlock.java | 2 +- .../silicon/schematics/SchematicLaserTableBase.java | 2 +- common/buildcraft/transport/ActionActiveState.java | 2 +- common/buildcraft/transport/BlockFilteredBuffer.java | 2 +- common/buildcraft/transport/BlockGenericPipe.java | 2 +- common/buildcraft/transport/Gate.java | 2 +- common/buildcraft/transport/GuiHandler.java | 2 +- common/buildcraft/transport/IDiamondPipe.java | 2 +- common/buildcraft/transport/IFilteredPipe.java | 2 +- common/buildcraft/transport/IPipeConnectionForced.java | 2 +- common/buildcraft/transport/IPipeTransportFluidsHook.java | 2 +- common/buildcraft/transport/IPipeTransportPowerHook.java | 2 +- common/buildcraft/transport/ISolidSideTile.java | 2 +- common/buildcraft/transport/ItemFacade.java | 2 +- common/buildcraft/transport/ItemPipe.java | 2 +- common/buildcraft/transport/ItemPipeWire.java | 2 +- common/buildcraft/transport/Pipe.java | 2 +- common/buildcraft/transport/PipeConnectionBans.java | 2 +- common/buildcraft/transport/PipeIconProvider.java | 2 +- common/buildcraft/transport/PipeRenderState.java | 2 +- common/buildcraft/transport/PipeToolTipManager.java | 2 +- common/buildcraft/transport/PipeTransport.java | 2 +- common/buildcraft/transport/PipeTransportFluids.java | 2 +- common/buildcraft/transport/PipeTransportItems.java | 2 +- common/buildcraft/transport/PipeTransportPower.java | 2 +- common/buildcraft/transport/PipeTransportStructure.java | 2 +- common/buildcraft/transport/PipeTriggerProvider.java | 2 +- common/buildcraft/transport/TileFilteredBuffer.java | 2 +- common/buildcraft/transport/TileGenericPipe.java | 2 +- common/buildcraft/transport/TransportConstants.java | 2 +- common/buildcraft/transport/TransportProxy.java | 2 +- common/buildcraft/transport/TransportProxyClient.java | 2 +- common/buildcraft/transport/TravelerSet.java | 2 +- common/buildcraft/transport/TravelingItem.java | 2 +- common/buildcraft/transport/WireIconProvider.java | 2 +- common/buildcraft/transport/gates/ActionIterator.java | 2 +- common/buildcraft/transport/gates/GateDefinition.java | 2 +- .../buildcraft/transport/gates/GateExpansionBuildcraft.java | 2 +- common/buildcraft/transport/gates/GateExpansionPulsar.java | 2 +- .../transport/gates/GateExpansionRedstoneFader.java | 2 +- common/buildcraft/transport/gates/GateExpansionTimer.java | 2 +- common/buildcraft/transport/gates/GateFactory.java | 2 +- common/buildcraft/transport/gates/ItemGate.java | 2 +- common/buildcraft/transport/gates/StatementSlot.java | 2 +- common/buildcraft/transport/gui/ContainerDiamondPipe.java | 2 +- .../buildcraft/transport/gui/ContainerEmeraldFluidPipe.java | 2 +- common/buildcraft/transport/gui/ContainerEmeraldPipe.java | 2 +- common/buildcraft/transport/gui/ContainerEmzuliPipe.java | 2 +- common/buildcraft/transport/gui/ContainerFilteredBuffer.java | 2 +- common/buildcraft/transport/gui/ContainerGateInterface.java | 2 +- common/buildcraft/transport/gui/GuiDiamondPipe.java | 2 +- common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java | 2 +- common/buildcraft/transport/gui/GuiEmeraldPipe.java | 2 +- common/buildcraft/transport/gui/GuiEmzuliPipe.java | 2 +- common/buildcraft/transport/gui/GuiFilteredBuffer.java | 2 +- common/buildcraft/transport/gui/GuiGateInterface.java | 2 +- common/buildcraft/transport/network/PacketFluidUpdate.java | 2 +- .../buildcraft/transport/network/PacketHandlerTransport.java | 2 +- .../transport/network/PacketPipeTransportItemStack.java | 2 +- .../network/PacketPipeTransportItemStackRequest.java | 2 +- .../transport/network/PacketPipeTransportTraveler.java | 2 +- common/buildcraft/transport/network/PacketPowerUpdate.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsCobblestone.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsDiamond.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsEmerald.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsGold.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsIron.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsQuartz.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsSandstone.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsStone.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsVoid.java | 2 +- common/buildcraft/transport/pipes/PipeFluidsWood.java | 2 +- common/buildcraft/transport/pipes/PipeItemsClay.java | 2 +- common/buildcraft/transport/pipes/PipeItemsCobblestone.java | 2 +- common/buildcraft/transport/pipes/PipeItemsDaizuli.java | 2 +- common/buildcraft/transport/pipes/PipeItemsDiamond.java | 2 +- common/buildcraft/transport/pipes/PipeItemsEmerald.java | 2 +- common/buildcraft/transport/pipes/PipeItemsEmzuli.java | 2 +- common/buildcraft/transport/pipes/PipeItemsGold.java | 2 +- common/buildcraft/transport/pipes/PipeItemsIron.java | 2 +- common/buildcraft/transport/pipes/PipeItemsLapis.java | 2 +- common/buildcraft/transport/pipes/PipeItemsObsidian.java | 2 +- common/buildcraft/transport/pipes/PipeItemsQuartz.java | 2 +- common/buildcraft/transport/pipes/PipeItemsSandstone.java | 2 +- common/buildcraft/transport/pipes/PipeItemsStone.java | 2 +- common/buildcraft/transport/pipes/PipeItemsStripes.java | 2 +- common/buildcraft/transport/pipes/PipeItemsVoid.java | 2 +- common/buildcraft/transport/pipes/PipeItemsWood.java | 2 +- common/buildcraft/transport/pipes/PipeLogicIron.java | 2 +- common/buildcraft/transport/pipes/PipeLogicWood.java | 2 +- common/buildcraft/transport/pipes/PipePowerCobblestone.java | 2 +- common/buildcraft/transport/pipes/PipePowerDiamond.java | 2 +- common/buildcraft/transport/pipes/PipePowerGold.java | 2 +- common/buildcraft/transport/pipes/PipePowerIron.java | 2 +- common/buildcraft/transport/pipes/PipePowerQuartz.java | 2 +- common/buildcraft/transport/pipes/PipePowerSandstone.java | 2 +- common/buildcraft/transport/pipes/PipePowerStone.java | 2 +- common/buildcraft/transport/pipes/PipePowerWood.java | 2 +- .../buildcraft/transport/pipes/PipeStructureCobblestone.java | 2 +- common/buildcraft/transport/pipes/events/PipeEvent.java | 2 +- common/buildcraft/transport/pipes/events/PipeEventItem.java | 2 +- common/buildcraft/transport/pluggable/ItemLens.java | 2 +- common/buildcraft/transport/pluggable/ItemPlug.java | 2 +- common/buildcraft/transport/pluggable/ItemPowerAdapter.java | 2 +- common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java | 2 +- common/buildcraft/transport/recipes/GateExpansionRecipe.java | 2 +- common/buildcraft/transport/recipes/GateLogicSwapRecipe.java | 2 +- .../buildcraft/transport/recipes/IntegrationTableRecipe.java | 2 +- common/buildcraft/transport/render/FacadeItemRenderer.java | 2 +- common/buildcraft/transport/render/FacadeRenderHelper.java | 2 +- common/buildcraft/transport/render/FakeBlock.java | 2 +- common/buildcraft/transport/render/GateItemRenderer.java | 2 +- common/buildcraft/transport/render/PipeItemRenderer.java | 2 +- common/buildcraft/transport/render/PipeRendererTESR.java | 2 +- common/buildcraft/transport/render/PipeRendererWorld.java | 2 +- common/buildcraft/transport/render/PlugItemRenderer.java | 2 +- .../buildcraft/transport/render/RobotStationItemRenderer.java | 2 +- common/buildcraft/transport/render/TextureStateManager.java | 2 +- common/buildcraft/transport/render/TileEntityPickupFX.java | 2 +- .../buildcraft/transport/schematics/BptItemPipeFilters.java | 2 +- common/buildcraft/transport/schematics/BptPipeExtension.java | 2 +- common/buildcraft/transport/schematics/BptPipeIron.java | 2 +- common/buildcraft/transport/schematics/BptPipeWooden.java | 2 +- common/buildcraft/transport/schematics/SchematicPipe.java | 2 +- .../buildcraft/transport/statements/ActionEnergyPulsar.java | 2 +- .../transport/statements/ActionExtractionPreset.java | 2 +- .../transport/statements/ActionParameterSignal.java | 2 +- common/buildcraft/transport/statements/ActionPipeColor.java | 2 +- .../buildcraft/transport/statements/ActionPipeDirection.java | 2 +- .../buildcraft/transport/statements/ActionPowerLimiter.java | 2 +- .../transport/statements/ActionRedstoneFaderOutput.java | 2 +- .../buildcraft/transport/statements/ActionSignalOutput.java | 2 +- .../transport/statements/ActionSingleEnergyPulse.java | 2 +- common/buildcraft/transport/statements/ActionValve.java | 2 +- common/buildcraft/transport/statements/TriggerClockTimer.java | 2 +- .../transport/statements/TriggerParameterSignal.java | 2 +- .../buildcraft/transport/statements/TriggerPipeContents.java | 2 +- common/buildcraft/transport/statements/TriggerPipeSignal.java | 2 +- .../transport/statements/TriggerRedstoneFaderInput.java | 2 +- .../buildcraft/transport/stripes/StripesHandlerDefault.java | 2 +- .../transport/stripes/StripesHandlerEntityInteract.java | 2 +- common/buildcraft/transport/stripes/StripesHandlerPipes.java | 2 +- .../transport/stripes/StripesHandlerPlaceBlock.java | 2 +- common/buildcraft/transport/utils/BitSetCodec.java | 2 +- common/buildcraft/transport/utils/ConnectionMatrix.java | 2 +- common/buildcraft/transport/utils/TextureMatrix.java | 2 +- common/buildcraft/transport/utils/TransportUtils.java | 2 +- common/buildcraft/transport/utils/WireMatrix.java | 2 +- 843 files changed, 844 insertions(+), 844 deletions(-) diff --git a/api/buildcraft/api/blueprints/BlueprintDeployer.java b/api/buildcraft/api/blueprints/BlueprintDeployer.java index aa5f1d28..8ce8ffe0 100755 --- a/api/buildcraft/api/blueprints/BlueprintDeployer.java +++ b/api/buildcraft/api/blueprints/BlueprintDeployer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/BuilderAPI.java b/api/buildcraft/api/blueprints/BuilderAPI.java index c10d5f60..5cc25ac9 100644 --- a/api/buildcraft/api/blueprints/BuilderAPI.java +++ b/api/buildcraft/api/blueprints/BuilderAPI.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/BuildingPermission.java b/api/buildcraft/api/blueprints/BuildingPermission.java index c6850692..cf00a639 100755 --- a/api/buildcraft/api/blueprints/BuildingPermission.java +++ b/api/buildcraft/api/blueprints/BuildingPermission.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/IBuilderContext.java b/api/buildcraft/api/blueprints/IBuilderContext.java index c6eaab5a..5e1e6148 100644 --- a/api/buildcraft/api/blueprints/IBuilderContext.java +++ b/api/buildcraft/api/blueprints/IBuilderContext.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/ISchematicRegistry.java b/api/buildcraft/api/blueprints/ISchematicRegistry.java index f28fd4a4..7a2f4f39 100644 --- a/api/buildcraft/api/blueprints/ISchematicRegistry.java +++ b/api/buildcraft/api/blueprints/ISchematicRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/ITileBuilder.java b/api/buildcraft/api/blueprints/ITileBuilder.java index 6135469e..b5517854 100755 --- a/api/buildcraft/api/blueprints/ITileBuilder.java +++ b/api/buildcraft/api/blueprints/ITileBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/MappingNotFoundException.java b/api/buildcraft/api/blueprints/MappingNotFoundException.java index d9bd7448..66445393 100755 --- a/api/buildcraft/api/blueprints/MappingNotFoundException.java +++ b/api/buildcraft/api/blueprints/MappingNotFoundException.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/MappingRegistry.java b/api/buildcraft/api/blueprints/MappingRegistry.java index ec0b13c4..dd91cec0 100755 --- a/api/buildcraft/api/blueprints/MappingRegistry.java +++ b/api/buildcraft/api/blueprints/MappingRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/Schematic.java b/api/buildcraft/api/blueprints/Schematic.java index 9c23acd9..4db2d289 100755 --- a/api/buildcraft/api/blueprints/Schematic.java +++ b/api/buildcraft/api/blueprints/Schematic.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/SchematicBlock.java b/api/buildcraft/api/blueprints/SchematicBlock.java index a89d36d4..1442783d 100755 --- a/api/buildcraft/api/blueprints/SchematicBlock.java +++ b/api/buildcraft/api/blueprints/SchematicBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/SchematicBlockBase.java b/api/buildcraft/api/blueprints/SchematicBlockBase.java index 3693c707..432095f6 100755 --- a/api/buildcraft/api/blueprints/SchematicBlockBase.java +++ b/api/buildcraft/api/blueprints/SchematicBlockBase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/SchematicEntity.java b/api/buildcraft/api/blueprints/SchematicEntity.java index 55a47279..8dc12f85 100755 --- a/api/buildcraft/api/blueprints/SchematicEntity.java +++ b/api/buildcraft/api/blueprints/SchematicEntity.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/SchematicFactory.java b/api/buildcraft/api/blueprints/SchematicFactory.java index b6052a8e..6eda0975 100755 --- a/api/buildcraft/api/blueprints/SchematicFactory.java +++ b/api/buildcraft/api/blueprints/SchematicFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/SchematicFluid.java b/api/buildcraft/api/blueprints/SchematicFluid.java index 41874dda..d137f16d 100644 --- a/api/buildcraft/api/blueprints/SchematicFluid.java +++ b/api/buildcraft/api/blueprints/SchematicFluid.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/SchematicMask.java b/api/buildcraft/api/blueprints/SchematicMask.java index 1abc1368..e05e6360 100755 --- a/api/buildcraft/api/blueprints/SchematicMask.java +++ b/api/buildcraft/api/blueprints/SchematicMask.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/SchematicTile.java b/api/buildcraft/api/blueprints/SchematicTile.java index b3f06f06..b917fef2 100755 --- a/api/buildcraft/api/blueprints/SchematicTile.java +++ b/api/buildcraft/api/blueprints/SchematicTile.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/Translation.java b/api/buildcraft/api/blueprints/Translation.java index b086492b..d55c846a 100755 --- a/api/buildcraft/api/blueprints/Translation.java +++ b/api/buildcraft/api/blueprints/Translation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/blueprints/package-info.java b/api/buildcraft/api/blueprints/package-info.java index 49179a48..a041a45f 100644 --- a/api/buildcraft/api/blueprints/package-info.java +++ b/api/buildcraft/api/blueprints/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/boards/IRedstoneBoard.java b/api/buildcraft/api/boards/IRedstoneBoard.java index d9e165ea..bee5e619 100755 --- a/api/buildcraft/api/boards/IRedstoneBoard.java +++ b/api/buildcraft/api/boards/IRedstoneBoard.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/boards/RedstoneBoardNBT.java b/api/buildcraft/api/boards/RedstoneBoardNBT.java index c94b0cdb..bfd3f0ab 100755 --- a/api/buildcraft/api/boards/RedstoneBoardNBT.java +++ b/api/buildcraft/api/boards/RedstoneBoardNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/boards/RedstoneBoardRegistry.java b/api/buildcraft/api/boards/RedstoneBoardRegistry.java index 57eda12c..30f959bc 100755 --- a/api/buildcraft/api/boards/RedstoneBoardRegistry.java +++ b/api/buildcraft/api/boards/RedstoneBoardRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/boards/RedstoneBoardRobot.java b/api/buildcraft/api/boards/RedstoneBoardRobot.java index 6f87ea52..68b66702 100755 --- a/api/buildcraft/api/boards/RedstoneBoardRobot.java +++ b/api/buildcraft/api/boards/RedstoneBoardRobot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java b/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java index 595a6c5d..b1fbd2b8 100755 --- a/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java +++ b/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/boards/package-info.java b/api/buildcraft/api/boards/package-info.java index 2c97919e..6b71e38e 100644 --- a/api/buildcraft/api/boards/package-info.java +++ b/api/buildcraft/api/boards/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/BCLog.java b/api/buildcraft/api/core/BCLog.java index 2ccf2bd5..7f2896de 100644 --- a/api/buildcraft/api/core/BCLog.java +++ b/api/buildcraft/api/core/BCLog.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. @@ -27,7 +27,7 @@ public final class BCLog { public static void initLog() { logger.info("Starting BuildCraft " + getVersion()); - logger.info("Copyright (c) SpaceToad, 2011-2014"); + logger.info("Copyright (c) SpaceToad, 2011-2015"); logger.info("http://www.mod-buildcraft.com"); } diff --git a/api/buildcraft/api/core/BlockIndex.java b/api/buildcraft/api/core/BlockIndex.java index 0b898512..cf378ea8 100644 --- a/api/buildcraft/api/core/BlockIndex.java +++ b/api/buildcraft/api/core/BlockIndex.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/BuildCraftAPI.java b/api/buildcraft/api/core/BuildCraftAPI.java index de1933e9..ece327f9 100644 --- a/api/buildcraft/api/core/BuildCraftAPI.java +++ b/api/buildcraft/api/core/BuildCraftAPI.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/EnumColor.java b/api/buildcraft/api/core/EnumColor.java index bdc94fcc..10e7121d 100644 --- a/api/buildcraft/api/core/EnumColor.java +++ b/api/buildcraft/api/core/EnumColor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/IAreaProvider.java b/api/buildcraft/api/core/IAreaProvider.java index 92bd4d6a..ac82cd5e 100644 --- a/api/buildcraft/api/core/IAreaProvider.java +++ b/api/buildcraft/api/core/IAreaProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/IBox.java b/api/buildcraft/api/core/IBox.java index c839c65b..e1e6f7d8 100644 --- a/api/buildcraft/api/core/IBox.java +++ b/api/buildcraft/api/core/IBox.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/ICoreProxy.java b/api/buildcraft/api/core/ICoreProxy.java index b3b5767c..272faebf 100755 --- a/api/buildcraft/api/core/ICoreProxy.java +++ b/api/buildcraft/api/core/ICoreProxy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/IIconProvider.java b/api/buildcraft/api/core/IIconProvider.java index 09aa7009..fb323f4a 100644 --- a/api/buildcraft/api/core/IIconProvider.java +++ b/api/buildcraft/api/core/IIconProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/IInvSlot.java b/api/buildcraft/api/core/IInvSlot.java index 1219f640..278792ad 100644 --- a/api/buildcraft/api/core/IInvSlot.java +++ b/api/buildcraft/api/core/IInvSlot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/ISerializable.java b/api/buildcraft/api/core/ISerializable.java index b8a11e8d..a7d011eb 100644 --- a/api/buildcraft/api/core/ISerializable.java +++ b/api/buildcraft/api/core/ISerializable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/api/buildcraft/api/core/IWorldProperty.java b/api/buildcraft/api/core/IWorldProperty.java index fa9a3046..a55bef1f 100755 --- a/api/buildcraft/api/core/IWorldProperty.java +++ b/api/buildcraft/api/core/IWorldProperty.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/IZone.java b/api/buildcraft/api/core/IZone.java index 2eee45ea..88f8b03a 100755 --- a/api/buildcraft/api/core/IZone.java +++ b/api/buildcraft/api/core/IZone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/JavaTools.java b/api/buildcraft/api/core/JavaTools.java index 3bbd90de..e8dd4d89 100755 --- a/api/buildcraft/api/core/JavaTools.java +++ b/api/buildcraft/api/core/JavaTools.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/Position.java b/api/buildcraft/api/core/Position.java index f4ad825c..912840cf 100644 --- a/api/buildcraft/api/core/Position.java +++ b/api/buildcraft/api/core/Position.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/SafeTimeTracker.java b/api/buildcraft/api/core/SafeTimeTracker.java index ab96ca26..3e56ee98 100644 --- a/api/buildcraft/api/core/SafeTimeTracker.java +++ b/api/buildcraft/api/core/SafeTimeTracker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/StackKey.java b/api/buildcraft/api/core/StackKey.java index 257d8449..5aed4c4a 100644 --- a/api/buildcraft/api/core/StackKey.java +++ b/api/buildcraft/api/core/StackKey.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/package-info.java b/api/buildcraft/api/core/package-info.java index d9e45bc9..60436f3d 100644 --- a/api/buildcraft/api/core/package-info.java +++ b/api/buildcraft/api/core/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/core/render/ICullable.java b/api/buildcraft/api/core/render/ICullable.java index 5bdec019..122c9c25 100644 --- a/api/buildcraft/api/core/render/ICullable.java +++ b/api/buildcraft/api/core/render/ICullable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/api/buildcraft/api/core/render/ITextureStates.java b/api/buildcraft/api/core/render/ITextureStates.java index 3314982e..835caf7f 100644 --- a/api/buildcraft/api/core/render/ITextureStates.java +++ b/api/buildcraft/api/core/render/ITextureStates.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/api/buildcraft/api/events/BlockInteractionEvent.java b/api/buildcraft/api/events/BlockInteractionEvent.java index 795a6b48..d95af724 100644 --- a/api/buildcraft/api/events/BlockInteractionEvent.java +++ b/api/buildcraft/api/events/BlockInteractionEvent.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/events/BlockPlacedDownEvent.java b/api/buildcraft/api/events/BlockPlacedDownEvent.java index 4d7072eb..0882be85 100644 --- a/api/buildcraft/api/events/BlockPlacedDownEvent.java +++ b/api/buildcraft/api/events/BlockPlacedDownEvent.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/events/PipePlacedEvent.java b/api/buildcraft/api/events/PipePlacedEvent.java index 53f907c2..f7f765c2 100644 --- a/api/buildcraft/api/events/PipePlacedEvent.java +++ b/api/buildcraft/api/events/PipePlacedEvent.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/events/RobotPlacementEvent.java b/api/buildcraft/api/events/RobotPlacementEvent.java index 4f9525a7..fb27de8a 100644 --- a/api/buildcraft/api/events/RobotPlacementEvent.java +++ b/api/buildcraft/api/events/RobotPlacementEvent.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/events/package-info.java b/api/buildcraft/api/events/package-info.java index e51668a3..70d5b92b 100644 --- a/api/buildcraft/api/events/package-info.java +++ b/api/buildcraft/api/events/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/facades/FacadeType.java b/api/buildcraft/api/facades/FacadeType.java index 3da47c39..f9aa591e 100644 --- a/api/buildcraft/api/facades/FacadeType.java +++ b/api/buildcraft/api/facades/FacadeType.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/facades/IFacadeItem.java b/api/buildcraft/api/facades/IFacadeItem.java index 5237601b..8629f320 100644 --- a/api/buildcraft/api/facades/IFacadeItem.java +++ b/api/buildcraft/api/facades/IFacadeItem.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/facades/package-info.java b/api/buildcraft/api/facades/package-info.java index dc9bc18d..8c68c5fb 100644 --- a/api/buildcraft/api/facades/package-info.java +++ b/api/buildcraft/api/facades/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/filler/FillerManager.java b/api/buildcraft/api/filler/FillerManager.java index f25f80e1..b9ae0c2e 100644 --- a/api/buildcraft/api/filler/FillerManager.java +++ b/api/buildcraft/api/filler/FillerManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/filler/IFillerPattern.java b/api/buildcraft/api/filler/IFillerPattern.java index c18e5c2a..a732a474 100644 --- a/api/buildcraft/api/filler/IFillerPattern.java +++ b/api/buildcraft/api/filler/IFillerPattern.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/filler/IFillerRegistry.java b/api/buildcraft/api/filler/IFillerRegistry.java index 7fd72be2..00b3adde 100644 --- a/api/buildcraft/api/filler/IFillerRegistry.java +++ b/api/buildcraft/api/filler/IFillerRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/filler/package-info.java b/api/buildcraft/api/filler/package-info.java index 3709197f..f451c9af 100644 --- a/api/buildcraft/api/filler/package-info.java +++ b/api/buildcraft/api/filler/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java b/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java index 8d08873e..873f9376 100644 --- a/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java +++ b/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/fuels/ICoolant.java b/api/buildcraft/api/fuels/ICoolant.java index 15302bdc..17fdf09f 100644 --- a/api/buildcraft/api/fuels/ICoolant.java +++ b/api/buildcraft/api/fuels/ICoolant.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/fuels/ICoolantManager.java b/api/buildcraft/api/fuels/ICoolantManager.java index 2ed5c00a..ccf98798 100644 --- a/api/buildcraft/api/fuels/ICoolantManager.java +++ b/api/buildcraft/api/fuels/ICoolantManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/fuels/IFuel.java b/api/buildcraft/api/fuels/IFuel.java index 4b724bea..6bb018be 100644 --- a/api/buildcraft/api/fuels/IFuel.java +++ b/api/buildcraft/api/fuels/IFuel.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/fuels/IFuelManager.java b/api/buildcraft/api/fuels/IFuelManager.java index 48f2de57..c280885f 100644 --- a/api/buildcraft/api/fuels/IFuelManager.java +++ b/api/buildcraft/api/fuels/IFuelManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/fuels/ISolidCoolant.java b/api/buildcraft/api/fuels/ISolidCoolant.java index 573203ad..112d7793 100644 --- a/api/buildcraft/api/fuels/ISolidCoolant.java +++ b/api/buildcraft/api/fuels/ISolidCoolant.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/fuels/package-info.java b/api/buildcraft/api/fuels/package-info.java index 99a808c1..eca72994 100644 --- a/api/buildcraft/api/fuels/package-info.java +++ b/api/buildcraft/api/fuels/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/gates/GateExpansionController.java b/api/buildcraft/api/gates/GateExpansionController.java index cabb2a20..e37ae20a 100644 --- a/api/buildcraft/api/gates/GateExpansionController.java +++ b/api/buildcraft/api/gates/GateExpansionController.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/gates/GateExpansions.java b/api/buildcraft/api/gates/GateExpansions.java index 1edb2e42..1fcbafec 100644 --- a/api/buildcraft/api/gates/GateExpansions.java +++ b/api/buildcraft/api/gates/GateExpansions.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/gates/IGate.java b/api/buildcraft/api/gates/IGate.java index 2d173833..f5a00f12 100644 --- a/api/buildcraft/api/gates/IGate.java +++ b/api/buildcraft/api/gates/IGate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/gates/IGateExpansion.java b/api/buildcraft/api/gates/IGateExpansion.java index 4c51f040..ad61fad6 100644 --- a/api/buildcraft/api/gates/IGateExpansion.java +++ b/api/buildcraft/api/gates/IGateExpansion.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/gates/package-info.java b/api/buildcraft/api/gates/package-info.java index ac86f498..a7d4c23d 100644 --- a/api/buildcraft/api/gates/package-info.java +++ b/api/buildcraft/api/gates/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/package-info.java b/api/buildcraft/api/package-info.java index 8aef8a3d..81c35570 100644 --- a/api/buildcraft/api/package-info.java +++ b/api/buildcraft/api/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/power/IEngine.java b/api/buildcraft/api/power/IEngine.java index cd88558e..7fc6fd46 100644 --- a/api/buildcraft/api/power/IEngine.java +++ b/api/buildcraft/api/power/IEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/power/ILaserTarget.java b/api/buildcraft/api/power/ILaserTarget.java index 4b38493f..8cc151e6 100644 --- a/api/buildcraft/api/power/ILaserTarget.java +++ b/api/buildcraft/api/power/ILaserTarget.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/power/ILaserTargetBlock.java b/api/buildcraft/api/power/ILaserTargetBlock.java index 93a2a7c6..c2f658b7 100644 --- a/api/buildcraft/api/power/ILaserTargetBlock.java +++ b/api/buildcraft/api/power/ILaserTargetBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/power/IRedstoneEngine.java b/api/buildcraft/api/power/IRedstoneEngine.java index 0a25463a..3c847203 100644 --- a/api/buildcraft/api/power/IRedstoneEngine.java +++ b/api/buildcraft/api/power/IRedstoneEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/power/IRedstoneEngineReceiver.java b/api/buildcraft/api/power/IRedstoneEngineReceiver.java index bd720c73..65e4f6e8 100644 --- a/api/buildcraft/api/power/IRedstoneEngineReceiver.java +++ b/api/buildcraft/api/power/IRedstoneEngineReceiver.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/power/package-info.java b/api/buildcraft/api/power/package-info.java index a764949f..6ee4864d 100644 --- a/api/buildcraft/api/power/package-info.java +++ b/api/buildcraft/api/power/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java b/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java index 3aa945c1..42cad7d7 100644 --- a/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java +++ b/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/CraftingResult.java b/api/buildcraft/api/recipes/CraftingResult.java index d7b0e0fe..3a4eda16 100755 --- a/api/buildcraft/api/recipes/CraftingResult.java +++ b/api/buildcraft/api/recipes/CraftingResult.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/IAssemblyRecipeManager.java b/api/buildcraft/api/recipes/IAssemblyRecipeManager.java index e70c2328..58282f34 100644 --- a/api/buildcraft/api/recipes/IAssemblyRecipeManager.java +++ b/api/buildcraft/api/recipes/IAssemblyRecipeManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/IFlexibleCrafter.java b/api/buildcraft/api/recipes/IFlexibleCrafter.java index 95d1ce67..5fd9fdea 100644 --- a/api/buildcraft/api/recipes/IFlexibleCrafter.java +++ b/api/buildcraft/api/recipes/IFlexibleCrafter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/IFlexibleRecipe.java b/api/buildcraft/api/recipes/IFlexibleRecipe.java index a9a7553d..26c43e09 100755 --- a/api/buildcraft/api/recipes/IFlexibleRecipe.java +++ b/api/buildcraft/api/recipes/IFlexibleRecipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java b/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java index c63e0105..b3941eec 100644 --- a/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java +++ b/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/IIntegrationRecipe.java b/api/buildcraft/api/recipes/IIntegrationRecipe.java index c52b8814..ac65de96 100644 --- a/api/buildcraft/api/recipes/IIntegrationRecipe.java +++ b/api/buildcraft/api/recipes/IIntegrationRecipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/IIntegrationRecipeManager.java b/api/buildcraft/api/recipes/IIntegrationRecipeManager.java index 7bd2258e..b3022a00 100644 --- a/api/buildcraft/api/recipes/IIntegrationRecipeManager.java +++ b/api/buildcraft/api/recipes/IIntegrationRecipeManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/IProgrammingRecipeManager.java b/api/buildcraft/api/recipes/IProgrammingRecipeManager.java index 1b7ffa53..666571e5 100644 --- a/api/buildcraft/api/recipes/IProgrammingRecipeManager.java +++ b/api/buildcraft/api/recipes/IProgrammingRecipeManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/IRefineryRecipeManager.java b/api/buildcraft/api/recipes/IRefineryRecipeManager.java index 5d09508f..fe729b5c 100644 --- a/api/buildcraft/api/recipes/IRefineryRecipeManager.java +++ b/api/buildcraft/api/recipes/IRefineryRecipeManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/recipes/package-info.java b/api/buildcraft/api/recipes/package-info.java index a2f9f7bf..7591ac6f 100644 --- a/api/buildcraft/api/recipes/package-info.java +++ b/api/buildcraft/api/recipes/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/robots/AIRobot.java b/api/buildcraft/api/robots/AIRobot.java index 68420eab..c5c77d6f 100755 --- a/api/buildcraft/api/robots/AIRobot.java +++ b/api/buildcraft/api/robots/AIRobot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/robots/EntityRobotBase.java b/api/buildcraft/api/robots/EntityRobotBase.java index 0db1c32c..0e309a79 100755 --- a/api/buildcraft/api/robots/EntityRobotBase.java +++ b/api/buildcraft/api/robots/EntityRobotBase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/robots/IDockingStation.java b/api/buildcraft/api/robots/IDockingStation.java index 746a1a09..76e04622 100755 --- a/api/buildcraft/api/robots/IDockingStation.java +++ b/api/buildcraft/api/robots/IDockingStation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/robots/IRequestProvider.java b/api/buildcraft/api/robots/IRequestProvider.java index b227a586..95af8ea4 100755 --- a/api/buildcraft/api/robots/IRequestProvider.java +++ b/api/buildcraft/api/robots/IRequestProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/robots/IRobotRegistry.java b/api/buildcraft/api/robots/IRobotRegistry.java index 553e638d..1c9bb425 100755 --- a/api/buildcraft/api/robots/IRobotRegistry.java +++ b/api/buildcraft/api/robots/IRobotRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/robots/ResourceId.java b/api/buildcraft/api/robots/ResourceId.java index ed353e16..fba438e1 100755 --- a/api/buildcraft/api/robots/ResourceId.java +++ b/api/buildcraft/api/robots/ResourceId.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/robots/RobotManager.java b/api/buildcraft/api/robots/RobotManager.java index 0191b80d..917a1b1d 100644 --- a/api/buildcraft/api/robots/RobotManager.java +++ b/api/buildcraft/api/robots/RobotManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/api/buildcraft/api/robots/StackRequest.java b/api/buildcraft/api/robots/StackRequest.java index 555cd9a7..e1f5f768 100755 --- a/api/buildcraft/api/robots/StackRequest.java +++ b/api/buildcraft/api/robots/StackRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/robots/package-info.java b/api/buildcraft/api/robots/package-info.java index e6ac77fd..8cb80aae 100644 --- a/api/buildcraft/api/robots/package-info.java +++ b/api/buildcraft/api/robots/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/ActionState.java b/api/buildcraft/api/statements/ActionState.java index 5ef15e93..72e4d58b 100755 --- a/api/buildcraft/api/statements/ActionState.java +++ b/api/buildcraft/api/statements/ActionState.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/IActionExternal.java b/api/buildcraft/api/statements/IActionExternal.java index 520ea897..2aeb4510 100644 --- a/api/buildcraft/api/statements/IActionExternal.java +++ b/api/buildcraft/api/statements/IActionExternal.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/IActionInternal.java b/api/buildcraft/api/statements/IActionInternal.java index c8915bb0..6a019a45 100644 --- a/api/buildcraft/api/statements/IActionInternal.java +++ b/api/buildcraft/api/statements/IActionInternal.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/IActionProvider.java b/api/buildcraft/api/statements/IActionProvider.java index d5df6250..f202c2f7 100644 --- a/api/buildcraft/api/statements/IActionProvider.java +++ b/api/buildcraft/api/statements/IActionProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/IActionReceptor.java b/api/buildcraft/api/statements/IActionReceptor.java index 43e08477..db7cea02 100644 --- a/api/buildcraft/api/statements/IActionReceptor.java +++ b/api/buildcraft/api/statements/IActionReceptor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/IOverrideDefaultStatements.java b/api/buildcraft/api/statements/IOverrideDefaultStatements.java index a469d7d9..c9c7db8e 100644 --- a/api/buildcraft/api/statements/IOverrideDefaultStatements.java +++ b/api/buildcraft/api/statements/IOverrideDefaultStatements.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/IStatement.java b/api/buildcraft/api/statements/IStatement.java index aaadcfe1..85c42814 100644 --- a/api/buildcraft/api/statements/IStatement.java +++ b/api/buildcraft/api/statements/IStatement.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/IStatementContainer.java b/api/buildcraft/api/statements/IStatementContainer.java index 82bd6019..43a4f51e 100644 --- a/api/buildcraft/api/statements/IStatementContainer.java +++ b/api/buildcraft/api/statements/IStatementContainer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/IStatementParameter.java b/api/buildcraft/api/statements/IStatementParameter.java index 0dbf97e2..28655cf6 100755 --- a/api/buildcraft/api/statements/IStatementParameter.java +++ b/api/buildcraft/api/statements/IStatementParameter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/ITriggerExternal.java b/api/buildcraft/api/statements/ITriggerExternal.java index 6b268d19..bb969c1f 100644 --- a/api/buildcraft/api/statements/ITriggerExternal.java +++ b/api/buildcraft/api/statements/ITriggerExternal.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/ITriggerInternal.java b/api/buildcraft/api/statements/ITriggerInternal.java index d748152d..a4241d3d 100755 --- a/api/buildcraft/api/statements/ITriggerInternal.java +++ b/api/buildcraft/api/statements/ITriggerInternal.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/ITriggerProvider.java b/api/buildcraft/api/statements/ITriggerProvider.java index cc105957..763210a9 100644 --- a/api/buildcraft/api/statements/ITriggerProvider.java +++ b/api/buildcraft/api/statements/ITriggerProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/StatementManager.java b/api/buildcraft/api/statements/StatementManager.java index 167fa00d..28b6cbad 100644 --- a/api/buildcraft/api/statements/StatementManager.java +++ b/api/buildcraft/api/statements/StatementManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/StatementMouseClick.java b/api/buildcraft/api/statements/StatementMouseClick.java index 7be49ced..54688ebb 100644 --- a/api/buildcraft/api/statements/StatementMouseClick.java +++ b/api/buildcraft/api/statements/StatementMouseClick.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/StatementParameterItemStack.java b/api/buildcraft/api/statements/StatementParameterItemStack.java index 1ab38771..4de44608 100755 --- a/api/buildcraft/api/statements/StatementParameterItemStack.java +++ b/api/buildcraft/api/statements/StatementParameterItemStack.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/statements/package-info.java b/api/buildcraft/api/statements/package-info.java index bb5960f9..475deb29 100644 --- a/api/buildcraft/api/statements/package-info.java +++ b/api/buildcraft/api/statements/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/tiles/IControllable.java b/api/buildcraft/api/tiles/IControllable.java index 37775d98..3f56d359 100644 --- a/api/buildcraft/api/tiles/IControllable.java +++ b/api/buildcraft/api/tiles/IControllable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/tiles/IHasWork.java b/api/buildcraft/api/tiles/IHasWork.java index 2f00c7f6..cb068190 100644 --- a/api/buildcraft/api/tiles/IHasWork.java +++ b/api/buildcraft/api/tiles/IHasWork.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/tiles/IHeatable.java b/api/buildcraft/api/tiles/IHeatable.java index 23367f71..397d05f0 100644 --- a/api/buildcraft/api/tiles/IHeatable.java +++ b/api/buildcraft/api/tiles/IHeatable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/tiles/package-info.java b/api/buildcraft/api/tiles/package-info.java index 0e3d4d89..e436f5c9 100644 --- a/api/buildcraft/api/tiles/package-info.java +++ b/api/buildcraft/api/tiles/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/tools/IToolWrench.java b/api/buildcraft/api/tools/IToolWrench.java index c71e2b0d..c5c9d86f 100644 --- a/api/buildcraft/api/tools/IToolWrench.java +++ b/api/buildcraft/api/tools/IToolWrench.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/tools/package-info.java b/api/buildcraft/api/tools/package-info.java index 196f6388..538e11ea 100644 --- a/api/buildcraft/api/tools/package-info.java +++ b/api/buildcraft/api/tools/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/IPipe.java b/api/buildcraft/api/transport/IPipe.java index 75b5691b..94b021d0 100755 --- a/api/buildcraft/api/transport/IPipe.java +++ b/api/buildcraft/api/transport/IPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/IPipeConnection.java b/api/buildcraft/api/transport/IPipeConnection.java index 349ddd43..4899f24b 100644 --- a/api/buildcraft/api/transport/IPipeConnection.java +++ b/api/buildcraft/api/transport/IPipeConnection.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/IPipeTile.java b/api/buildcraft/api/transport/IPipeTile.java index 87112a98..e022518c 100644 --- a/api/buildcraft/api/transport/IPipeTile.java +++ b/api/buildcraft/api/transport/IPipeTile.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/IStripesActivator.java b/api/buildcraft/api/transport/IStripesActivator.java index 849e0316..8002f949 100644 --- a/api/buildcraft/api/transport/IStripesActivator.java +++ b/api/buildcraft/api/transport/IStripesActivator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/IStripesHandler.java b/api/buildcraft/api/transport/IStripesHandler.java index f84017e0..e915e2a3 100644 --- a/api/buildcraft/api/transport/IStripesHandler.java +++ b/api/buildcraft/api/transport/IStripesHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/IStripesPipe.java b/api/buildcraft/api/transport/IStripesPipe.java index ec5a6d47..30a8452d 100644 --- a/api/buildcraft/api/transport/IStripesPipe.java +++ b/api/buildcraft/api/transport/IStripesPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/PipeManager.java b/api/buildcraft/api/transport/PipeManager.java index be3a551d..82b9d525 100755 --- a/api/buildcraft/api/transport/PipeManager.java +++ b/api/buildcraft/api/transport/PipeManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/PipeWire.java b/api/buildcraft/api/transport/PipeWire.java index 6f2fd504..eb8665e1 100644 --- a/api/buildcraft/api/transport/PipeWire.java +++ b/api/buildcraft/api/transport/PipeWire.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/package-info.java b/api/buildcraft/api/transport/package-info.java index c91eebeb..dda1f6d0 100644 --- a/api/buildcraft/api/transport/package-info.java +++ b/api/buildcraft/api/transport/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/buildcraft/api/transport/pluggable/PipePluggable.java b/api/buildcraft/api/transport/pluggable/PipePluggable.java index c84700d1..dd2e6dbb 100755 --- a/api/buildcraft/api/transport/pluggable/PipePluggable.java +++ b/api/buildcraft/api/transport/pluggable/PipePluggable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/api/cofh/api/energy/package-info.java b/api/cofh/api/energy/package-info.java index 86aa7ad8..b31e5249 100644 --- a/api/cofh/api/energy/package-info.java +++ b/api/cofh/api/energy/package-info.java @@ -1,5 +1,5 @@ /** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub + * (C) 2015 Team CoFH / CoFH / Cult of the Full Hub * http://www.teamcofh.com */ @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy") diff --git a/api/cofh/api/package-info.java b/api/cofh/api/package-info.java index 08ff5fcb..e811c33f 100644 --- a/api/cofh/api/package-info.java +++ b/api/cofh/api/package-info.java @@ -1,5 +1,5 @@ /** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub + * (C) 2015 Team CoFH / CoFH / Cult of the Full Hub * http://www.teamcofh.com */ @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHLib", provides = "CoFHAPI") diff --git a/buildcraft_resources/LICENSE.API b/buildcraft_resources/LICENSE.API index 017c1bb2..a45b32e0 100644 --- a/buildcraft_resources/LICENSE.API +++ b/buildcraft_resources/LICENSE.API @@ -1,6 +1,6 @@ BuildCraft API License -Copyright (c) 2011-2014 SpaceToad and the BuildCraft team +Copyright (c) 2011-2015 SpaceToad and the BuildCraft team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 0449c08d..10177fd6 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index a9db4513..dbbb2b29 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 263e6747..f2b53831 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index 10026e1b..e9aeb5e8 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/BuildCraftMod.java b/common/buildcraft/BuildCraftMod.java index 8ba5c465..0a22d167 100644 --- a/common/buildcraft/BuildCraftMod.java +++ b/common/buildcraft/BuildCraftMod.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 1fe825a2..66674077 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index eff65b22..782da71c 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BlockArchitect.java b/common/buildcraft/builders/BlockArchitect.java index a8d43909..f0028e48 100644 --- a/common/buildcraft/builders/BlockArchitect.java +++ b/common/buildcraft/builders/BlockArchitect.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BlockBlueprintLibrary.java b/common/buildcraft/builders/BlockBlueprintLibrary.java index 6fad8f45..932d6685 100644 --- a/common/buildcraft/builders/BlockBlueprintLibrary.java +++ b/common/buildcraft/builders/BlockBlueprintLibrary.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BlockBuildTool.java b/common/buildcraft/builders/BlockBuildTool.java index 41f2bc93..79bd2b02 100755 --- a/common/buildcraft/builders/BlockBuildTool.java +++ b/common/buildcraft/builders/BlockBuildTool.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BlockBuilder.java b/common/buildcraft/builders/BlockBuilder.java index 04f0fd3e..e0b4f47c 100644 --- a/common/buildcraft/builders/BlockBuilder.java +++ b/common/buildcraft/builders/BlockBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BlockConstructionMarker.java b/common/buildcraft/builders/BlockConstructionMarker.java index 11ab3f60..521a1157 100755 --- a/common/buildcraft/builders/BlockConstructionMarker.java +++ b/common/buildcraft/builders/BlockConstructionMarker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BlockFiller.java b/common/buildcraft/builders/BlockFiller.java index 2b23bbda..f2c40501 100644 --- a/common/buildcraft/builders/BlockFiller.java +++ b/common/buildcraft/builders/BlockFiller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BlockMarker.java b/common/buildcraft/builders/BlockMarker.java index 5ae4d472..7872881b 100644 --- a/common/buildcraft/builders/BlockMarker.java +++ b/common/buildcraft/builders/BlockMarker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BlockPathMarker.java b/common/buildcraft/builders/BlockPathMarker.java index 79e22e98..cc0343d0 100644 --- a/common/buildcraft/builders/BlockPathMarker.java +++ b/common/buildcraft/builders/BlockPathMarker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BuilderProxy.java b/common/buildcraft/builders/BuilderProxy.java index 685ad0ab..0d3f7bb0 100644 --- a/common/buildcraft/builders/BuilderProxy.java +++ b/common/buildcraft/builders/BuilderProxy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/BuilderProxyClient.java b/common/buildcraft/builders/BuilderProxyClient.java index 6934d767..00d4a986 100644 --- a/common/buildcraft/builders/BuilderProxyClient.java +++ b/common/buildcraft/builders/BuilderProxyClient.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/EventHandlerBuilders.java b/common/buildcraft/builders/EventHandlerBuilders.java index 945ab686..92e4f0d0 100644 --- a/common/buildcraft/builders/EventHandlerBuilders.java +++ b/common/buildcraft/builders/EventHandlerBuilders.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/GuiHandler.java b/common/buildcraft/builders/GuiHandler.java index e0e69c45..447f76f8 100644 --- a/common/buildcraft/builders/GuiHandler.java +++ b/common/buildcraft/builders/GuiHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/ItemBlueprint.java b/common/buildcraft/builders/ItemBlueprint.java index ea2e1941..10e723ac 100644 --- a/common/buildcraft/builders/ItemBlueprint.java +++ b/common/buildcraft/builders/ItemBlueprint.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/ItemBlueprintStandard.java b/common/buildcraft/builders/ItemBlueprintStandard.java index ab0f827b..b47e4df0 100644 --- a/common/buildcraft/builders/ItemBlueprintStandard.java +++ b/common/buildcraft/builders/ItemBlueprintStandard.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/ItemBlueprintTemplate.java b/common/buildcraft/builders/ItemBlueprintTemplate.java index 3601566a..e92c4e38 100644 --- a/common/buildcraft/builders/ItemBlueprintTemplate.java +++ b/common/buildcraft/builders/ItemBlueprintTemplate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/ItemConstructionMarker.java b/common/buildcraft/builders/ItemConstructionMarker.java index 3dd77302..87a05363 100755 --- a/common/buildcraft/builders/ItemConstructionMarker.java +++ b/common/buildcraft/builders/ItemConstructionMarker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/RenderArchitect.java b/common/buildcraft/builders/RenderArchitect.java index db3f8f5b..f5e8a83c 100755 --- a/common/buildcraft/builders/RenderArchitect.java +++ b/common/buildcraft/builders/RenderArchitect.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/RenderConstructionMarker.java b/common/buildcraft/builders/RenderConstructionMarker.java index 697f1152..59425f12 100755 --- a/common/buildcraft/builders/RenderConstructionMarker.java +++ b/common/buildcraft/builders/RenderConstructionMarker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/RenderPathMarker.java b/common/buildcraft/builders/RenderPathMarker.java index 0effbd01..a26136c5 100755 --- a/common/buildcraft/builders/RenderPathMarker.java +++ b/common/buildcraft/builders/RenderPathMarker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/TileArchitect.java b/common/buildcraft/builders/TileArchitect.java index cc55921e..c6353030 100644 --- a/common/buildcraft/builders/TileArchitect.java +++ b/common/buildcraft/builders/TileArchitect.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/TileBlueprintLibrary.java b/common/buildcraft/builders/TileBlueprintLibrary.java index e5a502d1..f88f15d8 100644 --- a/common/buildcraft/builders/TileBlueprintLibrary.java +++ b/common/buildcraft/builders/TileBlueprintLibrary.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index c6533f9b..0677de6b 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/TileConstructionMarker.java b/common/buildcraft/builders/TileConstructionMarker.java index f582828c..dd23b333 100755 --- a/common/buildcraft/builders/TileConstructionMarker.java +++ b/common/buildcraft/builders/TileConstructionMarker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/TileFiller.java b/common/buildcraft/builders/TileFiller.java index be977303..15a5327f 100644 --- a/common/buildcraft/builders/TileFiller.java +++ b/common/buildcraft/builders/TileFiller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/TileMarker.java b/common/buildcraft/builders/TileMarker.java index ef087e60..cf6c2325 100644 --- a/common/buildcraft/builders/TileMarker.java +++ b/common/buildcraft/builders/TileMarker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/TilePathMarker.java b/common/buildcraft/builders/TilePathMarker.java index 5bbf74d8..59f97b77 100644 --- a/common/buildcraft/builders/TilePathMarker.java +++ b/common/buildcraft/builders/TilePathMarker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/blueprints/BlueprintDatabase.java b/common/buildcraft/builders/blueprints/BlueprintDatabase.java index 92ceae7f..c07fa2e2 100644 --- a/common/buildcraft/builders/blueprints/BlueprintDatabase.java +++ b/common/buildcraft/builders/blueprints/BlueprintDatabase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/blueprints/BlueprintId.java b/common/buildcraft/builders/blueprints/BlueprintId.java index 05c35cb6..89fafff6 100644 --- a/common/buildcraft/builders/blueprints/BlueprintId.java +++ b/common/buildcraft/builders/blueprints/BlueprintId.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/blueprints/IBlueprintBuilderAgent.java b/common/buildcraft/builders/blueprints/IBlueprintBuilderAgent.java index a12ed81d..40a65af0 100755 --- a/common/buildcraft/builders/blueprints/IBlueprintBuilderAgent.java +++ b/common/buildcraft/builders/blueprints/IBlueprintBuilderAgent.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/gui/ContainerArchitect.java b/common/buildcraft/builders/gui/ContainerArchitect.java index eceaddb3..06164280 100644 --- a/common/buildcraft/builders/gui/ContainerArchitect.java +++ b/common/buildcraft/builders/gui/ContainerArchitect.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java index d058617e..232a1e85 100644 --- a/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/ContainerBlueprintLibrary.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/gui/ContainerBuilder.java b/common/buildcraft/builders/gui/ContainerBuilder.java index ada40ace..a2da6c01 100644 --- a/common/buildcraft/builders/gui/ContainerBuilder.java +++ b/common/buildcraft/builders/gui/ContainerBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/gui/ContainerFiller.java b/common/buildcraft/builders/gui/ContainerFiller.java index f8108364..3b717a66 100644 --- a/common/buildcraft/builders/gui/ContainerFiller.java +++ b/common/buildcraft/builders/gui/ContainerFiller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/gui/GuiArchitect.java b/common/buildcraft/builders/gui/GuiArchitect.java index 1587c293..b2435036 100644 --- a/common/buildcraft/builders/gui/GuiArchitect.java +++ b/common/buildcraft/builders/gui/GuiArchitect.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java index b79369ef..5d6f6f45 100644 --- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java +++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/gui/GuiBuilder.java b/common/buildcraft/builders/gui/GuiBuilder.java index d9ac0c0e..816a1fce 100644 --- a/common/buildcraft/builders/gui/GuiBuilder.java +++ b/common/buildcraft/builders/gui/GuiBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/gui/GuiFiller.java b/common/buildcraft/builders/gui/GuiFiller.java index 7b6f660a..33f68a37 100644 --- a/common/buildcraft/builders/gui/GuiFiller.java +++ b/common/buildcraft/builders/gui/GuiFiller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicBed.java b/common/buildcraft/builders/schematics/SchematicBed.java index f14983b2..3038b66f 100644 --- a/common/buildcraft/builders/schematics/SchematicBed.java +++ b/common/buildcraft/builders/schematics/SchematicBed.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicBlockCreative.java b/common/buildcraft/builders/schematics/SchematicBlockCreative.java index 0d462ad8..013640b3 100755 --- a/common/buildcraft/builders/schematics/SchematicBlockCreative.java +++ b/common/buildcraft/builders/schematics/SchematicBlockCreative.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicCactus.java b/common/buildcraft/builders/schematics/SchematicCactus.java index c4575d25..df900ea9 100755 --- a/common/buildcraft/builders/schematics/SchematicCactus.java +++ b/common/buildcraft/builders/schematics/SchematicCactus.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicCustomStack.java b/common/buildcraft/builders/schematics/SchematicCustomStack.java index fd8a5661..0e3d9439 100644 --- a/common/buildcraft/builders/schematics/SchematicCustomStack.java +++ b/common/buildcraft/builders/schematics/SchematicCustomStack.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicDirt.java b/common/buildcraft/builders/schematics/SchematicDirt.java index 061d5436..f917c92e 100644 --- a/common/buildcraft/builders/schematics/SchematicDirt.java +++ b/common/buildcraft/builders/schematics/SchematicDirt.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicDoor.java b/common/buildcraft/builders/schematics/SchematicDoor.java index 633eb500..3a930fe2 100644 --- a/common/buildcraft/builders/schematics/SchematicDoor.java +++ b/common/buildcraft/builders/schematics/SchematicDoor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicEnderChest.java b/common/buildcraft/builders/schematics/SchematicEnderChest.java index 86ad533a..be08d703 100755 --- a/common/buildcraft/builders/schematics/SchematicEnderChest.java +++ b/common/buildcraft/builders/schematics/SchematicEnderChest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicFactoryBlock.java b/common/buildcraft/builders/schematics/SchematicFactoryBlock.java index a441d121..e7199642 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryBlock.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicFactoryEntity.java b/common/buildcraft/builders/schematics/SchematicFactoryEntity.java index 3beead96..39e4dcdb 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryEntity.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryEntity.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicFactoryMask.java b/common/buildcraft/builders/schematics/SchematicFactoryMask.java index 0f5e67e3..03bd2145 100755 --- a/common/buildcraft/builders/schematics/SchematicFactoryMask.java +++ b/common/buildcraft/builders/schematics/SchematicFactoryMask.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicFarmland.java b/common/buildcraft/builders/schematics/SchematicFarmland.java index 59587a8a..ccf3c8a1 100755 --- a/common/buildcraft/builders/schematics/SchematicFarmland.java +++ b/common/buildcraft/builders/schematics/SchematicFarmland.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicFire.java b/common/buildcraft/builders/schematics/SchematicFire.java index ab1b6ad8..885d61c5 100755 --- a/common/buildcraft/builders/schematics/SchematicFire.java +++ b/common/buildcraft/builders/schematics/SchematicFire.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicGlassPane.java b/common/buildcraft/builders/schematics/SchematicGlassPane.java index 44248c49..82308e27 100755 --- a/common/buildcraft/builders/schematics/SchematicGlassPane.java +++ b/common/buildcraft/builders/schematics/SchematicGlassPane.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicGravel.java b/common/buildcraft/builders/schematics/SchematicGravel.java index ca1dc5f4..cfaea1a1 100755 --- a/common/buildcraft/builders/schematics/SchematicGravel.java +++ b/common/buildcraft/builders/schematics/SchematicGravel.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicHanging.java b/common/buildcraft/builders/schematics/SchematicHanging.java index 1934e0d1..9729221c 100755 --- a/common/buildcraft/builders/schematics/SchematicHanging.java +++ b/common/buildcraft/builders/schematics/SchematicHanging.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicIgnore.java b/common/buildcraft/builders/schematics/SchematicIgnore.java index 15db1fbd..62dfe7c5 100644 --- a/common/buildcraft/builders/schematics/SchematicIgnore.java +++ b/common/buildcraft/builders/schematics/SchematicIgnore.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java b/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java index ebc47e11..5c965190 100644 --- a/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java +++ b/common/buildcraft/builders/schematics/SchematicIgnoreMeta.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicLever.java b/common/buildcraft/builders/schematics/SchematicLever.java index c3123329..5bf387b7 100644 --- a/common/buildcraft/builders/schematics/SchematicLever.java +++ b/common/buildcraft/builders/schematics/SchematicLever.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicMinecart.java b/common/buildcraft/builders/schematics/SchematicMinecart.java index 57119b93..c1032dac 100755 --- a/common/buildcraft/builders/schematics/SchematicMinecart.java +++ b/common/buildcraft/builders/schematics/SchematicMinecart.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicPiston.java b/common/buildcraft/builders/schematics/SchematicPiston.java index 74c0eb1f..66560bef 100644 --- a/common/buildcraft/builders/schematics/SchematicPiston.java +++ b/common/buildcraft/builders/schematics/SchematicPiston.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicPortal.java b/common/buildcraft/builders/schematics/SchematicPortal.java index 79c00952..04dbc97d 100755 --- a/common/buildcraft/builders/schematics/SchematicPortal.java +++ b/common/buildcraft/builders/schematics/SchematicPortal.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicPumpkin.java b/common/buildcraft/builders/schematics/SchematicPumpkin.java index c8829cee..18186a3c 100644 --- a/common/buildcraft/builders/schematics/SchematicPumpkin.java +++ b/common/buildcraft/builders/schematics/SchematicPumpkin.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicRail.java b/common/buildcraft/builders/schematics/SchematicRail.java index 28d0aea4..ce48e78f 100755 --- a/common/buildcraft/builders/schematics/SchematicRail.java +++ b/common/buildcraft/builders/schematics/SchematicRail.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java b/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java index 0c41e4e9..bec6ffe4 100644 --- a/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java +++ b/common/buildcraft/builders/schematics/SchematicRedstoneDiode.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java b/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java index 6c870a60..1b01e179 100755 --- a/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java +++ b/common/buildcraft/builders/schematics/SchematicRedstoneLamp.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicRedstoneWire.java b/common/buildcraft/builders/schematics/SchematicRedstoneWire.java index bd5cbaa0..85eed761 100755 --- a/common/buildcraft/builders/schematics/SchematicRedstoneWire.java +++ b/common/buildcraft/builders/schematics/SchematicRedstoneWire.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicRotateMeta.java b/common/buildcraft/builders/schematics/SchematicRotateMeta.java index 606b9749..643f9825 100644 --- a/common/buildcraft/builders/schematics/SchematicRotateMeta.java +++ b/common/buildcraft/builders/schematics/SchematicRotateMeta.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicSeeds.java b/common/buildcraft/builders/schematics/SchematicSeeds.java index cd5202a3..18b97e82 100755 --- a/common/buildcraft/builders/schematics/SchematicSeeds.java +++ b/common/buildcraft/builders/schematics/SchematicSeeds.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicSign.java b/common/buildcraft/builders/schematics/SchematicSign.java index 74b8ff65..616828b4 100644 --- a/common/buildcraft/builders/schematics/SchematicSign.java +++ b/common/buildcraft/builders/schematics/SchematicSign.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicSkull.java b/common/buildcraft/builders/schematics/SchematicSkull.java index 23ded253..365fd639 100755 --- a/common/buildcraft/builders/schematics/SchematicSkull.java +++ b/common/buildcraft/builders/schematics/SchematicSkull.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicStairs.java b/common/buildcraft/builders/schematics/SchematicStairs.java index c0046ef2..c5b90f8f 100644 --- a/common/buildcraft/builders/schematics/SchematicStairs.java +++ b/common/buildcraft/builders/schematics/SchematicStairs.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicStandalone.java b/common/buildcraft/builders/schematics/SchematicStandalone.java index d35868ac..a6ab2e79 100755 --- a/common/buildcraft/builders/schematics/SchematicStandalone.java +++ b/common/buildcraft/builders/schematics/SchematicStandalone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicStone.java b/common/buildcraft/builders/schematics/SchematicStone.java index 35e22d9e..1ec440bc 100755 --- a/common/buildcraft/builders/schematics/SchematicStone.java +++ b/common/buildcraft/builders/schematics/SchematicStone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicTileCreative.java b/common/buildcraft/builders/schematics/SchematicTileCreative.java index 383be2a8..5be292cf 100755 --- a/common/buildcraft/builders/schematics/SchematicTileCreative.java +++ b/common/buildcraft/builders/schematics/SchematicTileCreative.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicTripWireHook.java b/common/buildcraft/builders/schematics/SchematicTripWireHook.java index 4cdd8e82..6ed0327f 100755 --- a/common/buildcraft/builders/schematics/SchematicTripWireHook.java +++ b/common/buildcraft/builders/schematics/SchematicTripWireHook.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/schematics/SchematicWallSide.java b/common/buildcraft/builders/schematics/SchematicWallSide.java index ff4946f1..18a975fd 100644 --- a/common/buildcraft/builders/schematics/SchematicWallSide.java +++ b/common/buildcraft/builders/schematics/SchematicWallSide.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/statements/ActionFiller.java b/common/buildcraft/builders/statements/ActionFiller.java index caa545ec..a0e6ab3f 100644 --- a/common/buildcraft/builders/statements/ActionFiller.java +++ b/common/buildcraft/builders/statements/ActionFiller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/statements/BuildersActionProvider.java b/common/buildcraft/builders/statements/BuildersActionProvider.java index 36b40e4b..11c07bb9 100644 --- a/common/buildcraft/builders/statements/BuildersActionProvider.java +++ b/common/buildcraft/builders/statements/BuildersActionProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/AnchoredBox.java b/common/buildcraft/builders/urbanism/AnchoredBox.java index 32073793..816a4145 100755 --- a/common/buildcraft/builders/urbanism/AnchoredBox.java +++ b/common/buildcraft/builders/urbanism/AnchoredBox.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/BlockUrbanist.java b/common/buildcraft/builders/urbanism/BlockUrbanist.java index 3fadf16d..ff706ee9 100755 --- a/common/buildcraft/builders/urbanism/BlockUrbanist.java +++ b/common/buildcraft/builders/urbanism/BlockUrbanist.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/ContainerUrbanist.java b/common/buildcraft/builders/urbanism/ContainerUrbanist.java index 68acf7ef..4e64e845 100755 --- a/common/buildcraft/builders/urbanism/ContainerUrbanist.java +++ b/common/buildcraft/builders/urbanism/ContainerUrbanist.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/EntityUrbanist.java b/common/buildcraft/builders/urbanism/EntityUrbanist.java index b0a2015f..5d40c3c0 100755 --- a/common/buildcraft/builders/urbanism/EntityUrbanist.java +++ b/common/buildcraft/builders/urbanism/EntityUrbanist.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/GuiUrbanist.java b/common/buildcraft/builders/urbanism/GuiUrbanist.java index e5413959..a27863d8 100755 --- a/common/buildcraft/builders/urbanism/GuiUrbanist.java +++ b/common/buildcraft/builders/urbanism/GuiUrbanist.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/TileUrbanist.java b/common/buildcraft/builders/urbanism/TileUrbanist.java index 0b2e3bfc..cbd2d076 100755 --- a/common/buildcraft/builders/urbanism/TileUrbanist.java +++ b/common/buildcraft/builders/urbanism/TileUrbanist.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/UrbanistTool.java b/common/buildcraft/builders/urbanism/UrbanistTool.java index 3e65bb4b..174d014a 100755 --- a/common/buildcraft/builders/urbanism/UrbanistTool.java +++ b/common/buildcraft/builders/urbanism/UrbanistTool.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/UrbanistToolArea.java b/common/buildcraft/builders/urbanism/UrbanistToolArea.java index f93eaf07..40340dff 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolArea.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolArea.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/UrbanistToolBlock.java b/common/buildcraft/builders/urbanism/UrbanistToolBlock.java index bc6f248d..c3e9e850 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolBlock.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/UrbanistToolBlueprint.java b/common/buildcraft/builders/urbanism/UrbanistToolBlueprint.java index 92c8973d..b3afea52 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolBlueprint.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolBlueprint.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/UrbanistToolErase.java b/common/buildcraft/builders/urbanism/UrbanistToolErase.java index 78274459..59b4d28e 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolErase.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolErase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java index aa307659..304608da 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolFiller.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolFiller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/UrbanistToolPath.java b/common/buildcraft/builders/urbanism/UrbanistToolPath.java index ef220c01..3441a8c2 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolPath.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolPath.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java b/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java index fc7ae0db..c25fab96 100755 --- a/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java +++ b/common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/commander/BlockRequester.java b/common/buildcraft/commander/BlockRequester.java index f8788e4a..53378650 100755 --- a/common/buildcraft/commander/BlockRequester.java +++ b/common/buildcraft/commander/BlockRequester.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/commander/BlockZonePlan.java b/common/buildcraft/commander/BlockZonePlan.java index 3f5d36f2..47778db4 100755 --- a/common/buildcraft/commander/BlockZonePlan.java +++ b/common/buildcraft/commander/BlockZonePlan.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/commander/ContainerRequester.java b/common/buildcraft/commander/ContainerRequester.java index aa2eb1d7..b0eee46f 100755 --- a/common/buildcraft/commander/ContainerRequester.java +++ b/common/buildcraft/commander/ContainerRequester.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/commander/ContainerZonePlan.java b/common/buildcraft/commander/ContainerZonePlan.java index 97cec3ae..d7b47709 100755 --- a/common/buildcraft/commander/ContainerZonePlan.java +++ b/common/buildcraft/commander/ContainerZonePlan.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/commander/GuiRequester.java b/common/buildcraft/commander/GuiRequester.java index c44cbcfb..aeb49ffc 100755 --- a/common/buildcraft/commander/GuiRequester.java +++ b/common/buildcraft/commander/GuiRequester.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/commander/GuiZonePlan.java b/common/buildcraft/commander/GuiZonePlan.java index c7246960..88c7c9e0 100755 --- a/common/buildcraft/commander/GuiZonePlan.java +++ b/common/buildcraft/commander/GuiZonePlan.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/commander/TileRequester.java b/common/buildcraft/commander/TileRequester.java index 72021e8d..53b8b028 100755 --- a/common/buildcraft/commander/TileRequester.java +++ b/common/buildcraft/commander/TileRequester.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/commander/TileZonePlan.java b/common/buildcraft/commander/TileZonePlan.java index 927e0e10..462e7d34 100644 --- a/common/buildcraft/commander/TileZonePlan.java +++ b/common/buildcraft/commander/TileZonePlan.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/compat/CompatHooks.java b/common/buildcraft/compat/CompatHooks.java index c134912b..4a18318e 100644 --- a/common/buildcraft/compat/CompatHooks.java +++ b/common/buildcraft/compat/CompatHooks.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/BCDynamicTexture.java b/common/buildcraft/core/BCDynamicTexture.java index 9be16644..34083d33 100755 --- a/common/buildcraft/core/BCDynamicTexture.java +++ b/common/buildcraft/core/BCDynamicTexture.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/BlockBuildCraft.java b/common/buildcraft/core/BlockBuildCraft.java index e94de2a8..50463003 100644 --- a/common/buildcraft/core/BlockBuildCraft.java +++ b/common/buildcraft/core/BlockBuildCraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/BlockScanner.java b/common/buildcraft/core/BlockScanner.java index ec1047cd..466bdc11 100755 --- a/common/buildcraft/core/BlockScanner.java +++ b/common/buildcraft/core/BlockScanner.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/BlockSpring.java b/common/buildcraft/core/BlockSpring.java index e4b6aa7e..75170558 100644 --- a/common/buildcraft/core/BlockSpring.java +++ b/common/buildcraft/core/BlockSpring.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/BlockWrapper.java b/common/buildcraft/core/BlockWrapper.java index 7f9e5c4e..ae111a52 100755 --- a/common/buildcraft/core/BlockWrapper.java +++ b/common/buildcraft/core/BlockWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/Box.java b/common/buildcraft/core/Box.java index ec8f8256..a8515b89 100644 --- a/common/buildcraft/core/Box.java +++ b/common/buildcraft/core/Box.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/BoxProvider.java b/common/buildcraft/core/BoxProvider.java index 02738db2..7150b18f 100755 --- a/common/buildcraft/core/BoxProvider.java +++ b/common/buildcraft/core/BoxProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/BuildCraftConfiguration.java b/common/buildcraft/core/BuildCraftConfiguration.java index b0b9b8f6..7d5475af 100644 --- a/common/buildcraft/core/BuildCraftConfiguration.java +++ b/common/buildcraft/core/BuildCraftConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ChunkIndex.java b/common/buildcraft/core/ChunkIndex.java index c1ad0d8e..dfd10a3a 100755 --- a/common/buildcraft/core/ChunkIndex.java +++ b/common/buildcraft/core/ChunkIndex.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/CommandBuildCraft.java b/common/buildcraft/core/CommandBuildCraft.java index a7baaee2..435fa0a3 100644 --- a/common/buildcraft/core/CommandBuildCraft.java +++ b/common/buildcraft/core/CommandBuildCraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/CoreConstants.java b/common/buildcraft/core/CoreConstants.java index 4d9009c5..92702ce4 100644 --- a/common/buildcraft/core/CoreConstants.java +++ b/common/buildcraft/core/CoreConstants.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/CoreIconProvider.java b/common/buildcraft/core/CoreIconProvider.java index 160a7fcd..eecf4c9a 100644 --- a/common/buildcraft/core/CoreIconProvider.java +++ b/common/buildcraft/core/CoreIconProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/CreativeTabBuildCraft.java b/common/buildcraft/core/CreativeTabBuildCraft.java index 0e676cec..856b0b70 100644 --- a/common/buildcraft/core/CreativeTabBuildCraft.java +++ b/common/buildcraft/core/CreativeTabBuildCraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/DefaultAreaProvider.java b/common/buildcraft/core/DefaultAreaProvider.java index 8f01d0ae..26ecdac4 100644 --- a/common/buildcraft/core/DefaultAreaProvider.java +++ b/common/buildcraft/core/DefaultAreaProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/DefaultProps.java b/common/buildcraft/core/DefaultProps.java index 68630ce4..17d140d9 100644 --- a/common/buildcraft/core/DefaultProps.java +++ b/common/buildcraft/core/DefaultProps.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/EntityBlock.java b/common/buildcraft/core/EntityBlock.java index e76c2d18..29acc352 100644 --- a/common/buildcraft/core/EntityBlock.java +++ b/common/buildcraft/core/EntityBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/EntityLaser.java b/common/buildcraft/core/EntityLaser.java index e48aafc2..27911d72 100644 --- a/common/buildcraft/core/EntityLaser.java +++ b/common/buildcraft/core/EntityLaser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/GuiHandler.java b/common/buildcraft/core/GuiHandler.java index b7e216eb..2f347942 100755 --- a/common/buildcraft/core/GuiHandler.java +++ b/common/buildcraft/core/GuiHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/GuiIds.java b/common/buildcraft/core/GuiIds.java index 6739e489..7346beb6 100644 --- a/common/buildcraft/core/GuiIds.java +++ b/common/buildcraft/core/GuiIds.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/IBoxProvider.java b/common/buildcraft/core/IBoxProvider.java index cd4793da..26fb32f0 100755 --- a/common/buildcraft/core/IBoxProvider.java +++ b/common/buildcraft/core/IBoxProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/IBoxesProvider.java b/common/buildcraft/core/IBoxesProvider.java index 029611bc..845186cb 100755 --- a/common/buildcraft/core/IBoxesProvider.java +++ b/common/buildcraft/core/IBoxesProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ICustomHighlight.java b/common/buildcraft/core/ICustomHighlight.java index a6420e77..94e0747d 100644 --- a/common/buildcraft/core/ICustomHighlight.java +++ b/common/buildcraft/core/ICustomHighlight.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/IDropControlInventory.java b/common/buildcraft/core/IDropControlInventory.java index e70991b6..d32b459a 100644 --- a/common/buildcraft/core/IDropControlInventory.java +++ b/common/buildcraft/core/IDropControlInventory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/IFramePipeConnection.java b/common/buildcraft/core/IFramePipeConnection.java index fb4159da..d1ab1125 100644 --- a/common/buildcraft/core/IFramePipeConnection.java +++ b/common/buildcraft/core/IFramePipeConnection.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/IInventoryRenderer.java b/common/buildcraft/core/IInventoryRenderer.java index 5b95ec24..dd698e81 100644 --- a/common/buildcraft/core/IInventoryRenderer.java +++ b/common/buildcraft/core/IInventoryRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/IItemPipe.java b/common/buildcraft/core/IItemPipe.java index f1778a07..720d7f7e 100644 --- a/common/buildcraft/core/IItemPipe.java +++ b/common/buildcraft/core/IItemPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/IMachine.java b/common/buildcraft/core/IMachine.java index cc20cc85..f46e600b 100644 --- a/common/buildcraft/core/IMachine.java +++ b/common/buildcraft/core/IMachine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ITileBufferHolder.java b/common/buildcraft/core/ITileBufferHolder.java index 74e69e07..b79f992e 100644 --- a/common/buildcraft/core/ITileBufferHolder.java +++ b/common/buildcraft/core/ITileBufferHolder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/InterModComms.java b/common/buildcraft/core/InterModComms.java index 637f6d27..04de562b 100644 --- a/common/buildcraft/core/InterModComms.java +++ b/common/buildcraft/core/InterModComms.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ItemBlockBuildCraft.java b/common/buildcraft/core/ItemBlockBuildCraft.java index 4ac19c8d..c364a545 100644 --- a/common/buildcraft/core/ItemBlockBuildCraft.java +++ b/common/buildcraft/core/ItemBlockBuildCraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ItemBuildCraft.java b/common/buildcraft/core/ItemBuildCraft.java index 77b2d76b..c9cd0507 100644 --- a/common/buildcraft/core/ItemBuildCraft.java +++ b/common/buildcraft/core/ItemBuildCraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ItemGear.java b/common/buildcraft/core/ItemGear.java index aea05a0c..1f16a689 100755 --- a/common/buildcraft/core/ItemGear.java +++ b/common/buildcraft/core/ItemGear.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ItemList.java b/common/buildcraft/core/ItemList.java index 7d2bc9e1..769704cb 100644 --- a/common/buildcraft/core/ItemList.java +++ b/common/buildcraft/core/ItemList.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ItemMapLocation.java b/common/buildcraft/core/ItemMapLocation.java index 2f72b469..c2f41308 100755 --- a/common/buildcraft/core/ItemMapLocation.java +++ b/common/buildcraft/core/ItemMapLocation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ItemSpring.java b/common/buildcraft/core/ItemSpring.java index 27478438..f187c7ff 100644 --- a/common/buildcraft/core/ItemSpring.java +++ b/common/buildcraft/core/ItemSpring.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ItemWrench.java b/common/buildcraft/core/ItemWrench.java index 30a1aa6f..17bf0dbf 100644 --- a/common/buildcraft/core/ItemWrench.java +++ b/common/buildcraft/core/ItemWrench.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/LaserData.java b/common/buildcraft/core/LaserData.java index d8e7624e..58b7e477 100755 --- a/common/buildcraft/core/LaserData.java +++ b/common/buildcraft/core/LaserData.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/LaserKind.java b/common/buildcraft/core/LaserKind.java index 0eee976d..c46e488c 100644 --- a/common/buildcraft/core/LaserKind.java +++ b/common/buildcraft/core/LaserKind.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/SpringPopulate.java b/common/buildcraft/core/SpringPopulate.java index e345aae3..dc6b1ea0 100644 --- a/common/buildcraft/core/SpringPopulate.java +++ b/common/buildcraft/core/SpringPopulate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/StackAtPosition.java b/common/buildcraft/core/StackAtPosition.java index d81c9305..b53eb63f 100755 --- a/common/buildcraft/core/StackAtPosition.java +++ b/common/buildcraft/core/StackAtPosition.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/TickHandlerCore.java b/common/buildcraft/core/TickHandlerCore.java index f5998615..af4b1008 100644 --- a/common/buildcraft/core/TickHandlerCore.java +++ b/common/buildcraft/core/TickHandlerCore.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/TileBuffer.java b/common/buildcraft/core/TileBuffer.java index 655121f5..12f0e24c 100644 --- a/common/buildcraft/core/TileBuffer.java +++ b/common/buildcraft/core/TileBuffer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/TileBuildCraft.java index 517c9c56..93852fea 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/TileBuildCraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/Version.java b/common/buildcraft/core/Version.java index 5fd15491..d6fa3824 100644 --- a/common/buildcraft/core/Version.java +++ b/common/buildcraft/core/Version.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ZoneChunk.java b/common/buildcraft/core/ZoneChunk.java index 3dc64344..fa06c0b5 100755 --- a/common/buildcraft/core/ZoneChunk.java +++ b/common/buildcraft/core/ZoneChunk.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/ZonePlan.java b/common/buildcraft/core/ZonePlan.java index b36eb79d..1d6970d5 100755 --- a/common/buildcraft/core/ZonePlan.java +++ b/common/buildcraft/core/ZonePlan.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/Blueprint.java b/common/buildcraft/core/blueprints/Blueprint.java index e3682280..b4be5267 100644 --- a/common/buildcraft/core/blueprints/Blueprint.java +++ b/common/buildcraft/core/blueprints/Blueprint.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/BlueprintBase.java b/common/buildcraft/core/blueprints/BlueprintBase.java index 16026486..1e25259a 100644 --- a/common/buildcraft/core/blueprints/BlueprintBase.java +++ b/common/buildcraft/core/blueprints/BlueprintBase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java b/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java index 4be26793..029da217 100755 --- a/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java +++ b/common/buildcraft/core/blueprints/BlueprintReadConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/BptBuilderBase.java b/common/buildcraft/core/blueprints/BptBuilderBase.java index 9da82034..40a32fd0 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBase.java +++ b/common/buildcraft/core/blueprints/BptBuilderBase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 0b95288b..1769b692 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index dfa3c0c8..e0c84025 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/BptContext.java b/common/buildcraft/core/blueprints/BptContext.java index 48e05d5c..0de1f181 100644 --- a/common/buildcraft/core/blueprints/BptContext.java +++ b/common/buildcraft/core/blueprints/BptContext.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/BptDataStream.java b/common/buildcraft/core/blueprints/BptDataStream.java index 790ad26c..f143f0e1 100644 --- a/common/buildcraft/core/blueprints/BptDataStream.java +++ b/common/buildcraft/core/blueprints/BptDataStream.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/BptError.java b/common/buildcraft/core/blueprints/BptError.java index 35f2209d..d8ce1c33 100644 --- a/common/buildcraft/core/blueprints/BptError.java +++ b/common/buildcraft/core/blueprints/BptError.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/RealBlueprintDeployer.java b/common/buildcraft/core/blueprints/RealBlueprintDeployer.java index 33063334..26e16172 100755 --- a/common/buildcraft/core/blueprints/RealBlueprintDeployer.java +++ b/common/buildcraft/core/blueprints/RealBlueprintDeployer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/RecursiveBlueprintBuilder.java b/common/buildcraft/core/blueprints/RecursiveBlueprintBuilder.java index 59b71070..4eb18b72 100755 --- a/common/buildcraft/core/blueprints/RecursiveBlueprintBuilder.java +++ b/common/buildcraft/core/blueprints/RecursiveBlueprintBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/RecursiveBlueprintReader.java b/common/buildcraft/core/blueprints/RecursiveBlueprintReader.java index 2b34da99..2e34e523 100644 --- a/common/buildcraft/core/blueprints/RecursiveBlueprintReader.java +++ b/common/buildcraft/core/blueprints/RecursiveBlueprintReader.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/SchematicRegistry.java b/common/buildcraft/core/blueprints/SchematicRegistry.java index d72a73e7..2caaafac 100644 --- a/common/buildcraft/core/blueprints/SchematicRegistry.java +++ b/common/buildcraft/core/blueprints/SchematicRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/blueprints/Template.java b/common/buildcraft/core/blueprints/Template.java index 9740f441..769798ac 100644 --- a/common/buildcraft/core/blueprints/Template.java +++ b/common/buildcraft/core/blueprints/Template.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/BuildingItem.java b/common/buildcraft/core/builders/BuildingItem.java index 280896c7..c3947f63 100755 --- a/common/buildcraft/core/builders/BuildingItem.java +++ b/common/buildcraft/core/builders/BuildingItem.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/BuildingSlot.java b/common/buildcraft/core/builders/BuildingSlot.java index 9f928a35..a333c40a 100755 --- a/common/buildcraft/core/builders/BuildingSlot.java +++ b/common/buildcraft/core/builders/BuildingSlot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/BuildingSlotBlock.java b/common/buildcraft/core/builders/BuildingSlotBlock.java index 4d2d166a..b0a168ef 100755 --- a/common/buildcraft/core/builders/BuildingSlotBlock.java +++ b/common/buildcraft/core/builders/BuildingSlotBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/BuildingSlotEntity.java b/common/buildcraft/core/builders/BuildingSlotEntity.java index ceaaa3be..af39071d 100755 --- a/common/buildcraft/core/builders/BuildingSlotEntity.java +++ b/common/buildcraft/core/builders/BuildingSlotEntity.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/BuildingSlotIterator.java b/common/buildcraft/core/builders/BuildingSlotIterator.java index 50238142..bed94db2 100755 --- a/common/buildcraft/core/builders/BuildingSlotIterator.java +++ b/common/buildcraft/core/builders/BuildingSlotIterator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/IBuildingItem.java b/common/buildcraft/core/builders/IBuildingItem.java index 93a2864c..3b11c034 100755 --- a/common/buildcraft/core/builders/IBuildingItem.java +++ b/common/buildcraft/core/builders/IBuildingItem.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/IBuildingItemsProvider.java b/common/buildcraft/core/builders/IBuildingItemsProvider.java index d7248133..2adce0e3 100755 --- a/common/buildcraft/core/builders/IBuildingItemsProvider.java +++ b/common/buildcraft/core/builders/IBuildingItemsProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/TileAbstractBuilder.java b/common/buildcraft/core/builders/TileAbstractBuilder.java index c2bdd2b0..68e2ccb1 100755 --- a/common/buildcraft/core/builders/TileAbstractBuilder.java +++ b/common/buildcraft/core/builders/TileAbstractBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/FillerPattern.java b/common/buildcraft/core/builders/patterns/FillerPattern.java index ee42b5ee..8c88da82 100644 --- a/common/buildcraft/core/builders/patterns/FillerPattern.java +++ b/common/buildcraft/core/builders/patterns/FillerPattern.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/FillerRegistry.java b/common/buildcraft/core/builders/patterns/FillerRegistry.java index 357f9dcb..8b795426 100644 --- a/common/buildcraft/core/builders/patterns/FillerRegistry.java +++ b/common/buildcraft/core/builders/patterns/FillerRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/PatternBox.java b/common/buildcraft/core/builders/patterns/PatternBox.java index 95555ec8..1c0b6b42 100644 --- a/common/buildcraft/core/builders/patterns/PatternBox.java +++ b/common/buildcraft/core/builders/patterns/PatternBox.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/PatternClear.java b/common/buildcraft/core/builders/patterns/PatternClear.java index 6bdb504c..96f9714a 100644 --- a/common/buildcraft/core/builders/patterns/PatternClear.java +++ b/common/buildcraft/core/builders/patterns/PatternClear.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/PatternCylinder.java b/common/buildcraft/core/builders/patterns/PatternCylinder.java index 3ed022cc..e3376ebd 100644 --- a/common/buildcraft/core/builders/patterns/PatternCylinder.java +++ b/common/buildcraft/core/builders/patterns/PatternCylinder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/PatternFill.java b/common/buildcraft/core/builders/patterns/PatternFill.java index 4539c976..066eabce 100644 --- a/common/buildcraft/core/builders/patterns/PatternFill.java +++ b/common/buildcraft/core/builders/patterns/PatternFill.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/PatternFlatten.java b/common/buildcraft/core/builders/patterns/PatternFlatten.java index 77c70926..12217caf 100644 --- a/common/buildcraft/core/builders/patterns/PatternFlatten.java +++ b/common/buildcraft/core/builders/patterns/PatternFlatten.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/PatternFrame.java b/common/buildcraft/core/builders/patterns/PatternFrame.java index dc953bd3..07663cf7 100755 --- a/common/buildcraft/core/builders/patterns/PatternFrame.java +++ b/common/buildcraft/core/builders/patterns/PatternFrame.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/PatternHorizon.java b/common/buildcraft/core/builders/patterns/PatternHorizon.java index eff3092a..9a12dbdf 100644 --- a/common/buildcraft/core/builders/patterns/PatternHorizon.java +++ b/common/buildcraft/core/builders/patterns/PatternHorizon.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/PatternPyramid.java b/common/buildcraft/core/builders/patterns/PatternPyramid.java index f03abdfa..608a762f 100644 --- a/common/buildcraft/core/builders/patterns/PatternPyramid.java +++ b/common/buildcraft/core/builders/patterns/PatternPyramid.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/builders/patterns/PatternStairs.java b/common/buildcraft/core/builders/patterns/PatternStairs.java index 97bb6f10..1039f266 100644 --- a/common/buildcraft/core/builders/patterns/PatternStairs.java +++ b/common/buildcraft/core/builders/patterns/PatternStairs.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/fluids/RestrictedTank.java b/common/buildcraft/core/fluids/RestrictedTank.java index 527ad3f6..1d1d7c2c 100644 --- a/common/buildcraft/core/fluids/RestrictedTank.java +++ b/common/buildcraft/core/fluids/RestrictedTank.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/fluids/SingleUseTank.java b/common/buildcraft/core/fluids/SingleUseTank.java index b2ebe7f7..7faa23ca 100644 --- a/common/buildcraft/core/fluids/SingleUseTank.java +++ b/common/buildcraft/core/fluids/SingleUseTank.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/fluids/Tank.java b/common/buildcraft/core/fluids/Tank.java index ab9fb1ea..d9904174 100644 --- a/common/buildcraft/core/fluids/Tank.java +++ b/common/buildcraft/core/fluids/Tank.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/fluids/TankManager.java b/common/buildcraft/core/fluids/TankManager.java index 95ec233c..ad5d69cd 100644 --- a/common/buildcraft/core/fluids/TankManager.java +++ b/common/buildcraft/core/fluids/TankManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/fluids/TankUtils.java b/common/buildcraft/core/fluids/TankUtils.java index 0b79ad6d..db675cef 100644 --- a/common/buildcraft/core/fluids/TankUtils.java +++ b/common/buildcraft/core/fluids/TankUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/AdvancedSlot.java b/common/buildcraft/core/gui/AdvancedSlot.java index 15e3855f..d24cbc72 100755 --- a/common/buildcraft/core/gui/AdvancedSlot.java +++ b/common/buildcraft/core/gui/AdvancedSlot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/BuildCraftContainer.java b/common/buildcraft/core/gui/BuildCraftContainer.java index c6d48ca5..870d223e 100644 --- a/common/buildcraft/core/gui/BuildCraftContainer.java +++ b/common/buildcraft/core/gui/BuildCraftContainer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/ContainerList.java b/common/buildcraft/core/gui/ContainerList.java index ffe4ca75..41a2969f 100755 --- a/common/buildcraft/core/gui/ContainerList.java +++ b/common/buildcraft/core/gui/ContainerList.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/FluidSlot.java b/common/buildcraft/core/gui/FluidSlot.java index 2d00e586..a2c406ef 100755 --- a/common/buildcraft/core/gui/FluidSlot.java +++ b/common/buildcraft/core/gui/FluidSlot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/GuiAdvancedInterface.java b/common/buildcraft/core/gui/GuiAdvancedInterface.java index 6101efd9..6ab8f2f3 100644 --- a/common/buildcraft/core/gui/GuiAdvancedInterface.java +++ b/common/buildcraft/core/gui/GuiAdvancedInterface.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/GuiBuildCraft.java b/common/buildcraft/core/gui/GuiBuildCraft.java index f7e48d7b..73af1e3c 100644 --- a/common/buildcraft/core/gui/GuiBuildCraft.java +++ b/common/buildcraft/core/gui/GuiBuildCraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/GuiList.java b/common/buildcraft/core/gui/GuiList.java index ac37b72c..522d8077 100755 --- a/common/buildcraft/core/gui/GuiList.java +++ b/common/buildcraft/core/gui/GuiList.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/GuiTools.java b/common/buildcraft/core/gui/GuiTools.java index f3115166..8e975f23 100644 --- a/common/buildcraft/core/gui/GuiTools.java +++ b/common/buildcraft/core/gui/GuiTools.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/IInventorySlot.java b/common/buildcraft/core/gui/IInventorySlot.java index 9d737213..9c5811dd 100755 --- a/common/buildcraft/core/gui/IInventorySlot.java +++ b/common/buildcraft/core/gui/IInventorySlot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/ItemSlot.java b/common/buildcraft/core/gui/ItemSlot.java index e9c5ea2a..cdb6e1c7 100755 --- a/common/buildcraft/core/gui/ItemSlot.java +++ b/common/buildcraft/core/gui/ItemSlot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/ButtonTextureSet.java b/common/buildcraft/core/gui/buttons/ButtonTextureSet.java index 82a5c9d6..0b4dc329 100644 --- a/common/buildcraft/core/gui/buttons/ButtonTextureSet.java +++ b/common/buildcraft/core/gui/buttons/ButtonTextureSet.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/GuiBetterButton.java b/common/buildcraft/core/gui/buttons/GuiBetterButton.java index c7227f40..8405f743 100644 --- a/common/buildcraft/core/gui/buttons/GuiBetterButton.java +++ b/common/buildcraft/core/gui/buttons/GuiBetterButton.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/GuiButtonSmall.java b/common/buildcraft/core/gui/buttons/GuiButtonSmall.java index a54c0b6a..be3d13c9 100644 --- a/common/buildcraft/core/gui/buttons/GuiButtonSmall.java +++ b/common/buildcraft/core/gui/buttons/GuiButtonSmall.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/GuiImageButton.java b/common/buildcraft/core/gui/buttons/GuiImageButton.java index d4f6475f..78ae8a7c 100644 --- a/common/buildcraft/core/gui/buttons/GuiImageButton.java +++ b/common/buildcraft/core/gui/buttons/GuiImageButton.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/GuiMultiButton.java b/common/buildcraft/core/gui/buttons/GuiMultiButton.java index 0d9370cf..03495bc1 100644 --- a/common/buildcraft/core/gui/buttons/GuiMultiButton.java +++ b/common/buildcraft/core/gui/buttons/GuiMultiButton.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/GuiToggleButton.java b/common/buildcraft/core/gui/buttons/GuiToggleButton.java index 11a7f2cc..e2c53fed 100644 --- a/common/buildcraft/core/gui/buttons/GuiToggleButton.java +++ b/common/buildcraft/core/gui/buttons/GuiToggleButton.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/GuiToggleButtonSmall.java b/common/buildcraft/core/gui/buttons/GuiToggleButtonSmall.java index 4ffe0111..b3ba03a5 100644 --- a/common/buildcraft/core/gui/buttons/GuiToggleButtonSmall.java +++ b/common/buildcraft/core/gui/buttons/GuiToggleButtonSmall.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/IButtonClickEventListener.java b/common/buildcraft/core/gui/buttons/IButtonClickEventListener.java index 4e82e948..1d20f98e 100644 --- a/common/buildcraft/core/gui/buttons/IButtonClickEventListener.java +++ b/common/buildcraft/core/gui/buttons/IButtonClickEventListener.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/IButtonClickEventTrigger.java b/common/buildcraft/core/gui/buttons/IButtonClickEventTrigger.java index ef22a559..26a47f8b 100644 --- a/common/buildcraft/core/gui/buttons/IButtonClickEventTrigger.java +++ b/common/buildcraft/core/gui/buttons/IButtonClickEventTrigger.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/IButtonTextureSet.java b/common/buildcraft/core/gui/buttons/IButtonTextureSet.java index 80b2ca23..d62354c1 100644 --- a/common/buildcraft/core/gui/buttons/IButtonTextureSet.java +++ b/common/buildcraft/core/gui/buttons/IButtonTextureSet.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/IMultiButtonState.java b/common/buildcraft/core/gui/buttons/IMultiButtonState.java index 296110f9..aec8677f 100644 --- a/common/buildcraft/core/gui/buttons/IMultiButtonState.java +++ b/common/buildcraft/core/gui/buttons/IMultiButtonState.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/LockButtonState.java b/common/buildcraft/core/gui/buttons/LockButtonState.java index 7b6a6f48..d42b971b 100644 --- a/common/buildcraft/core/gui/buttons/LockButtonState.java +++ b/common/buildcraft/core/gui/buttons/LockButtonState.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/MultiButtonController.java b/common/buildcraft/core/gui/buttons/MultiButtonController.java index fd9d936d..05726751 100644 --- a/common/buildcraft/core/gui/buttons/MultiButtonController.java +++ b/common/buildcraft/core/gui/buttons/MultiButtonController.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/buttons/StandardButtonTextureSets.java b/common/buildcraft/core/gui/buttons/StandardButtonTextureSets.java index 4654d4db..a6057130 100644 --- a/common/buildcraft/core/gui/buttons/StandardButtonTextureSets.java +++ b/common/buildcraft/core/gui/buttons/StandardButtonTextureSets.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/IPhantomSlot.java b/common/buildcraft/core/gui/slots/IPhantomSlot.java index 16184cf9..459954b2 100644 --- a/common/buildcraft/core/gui/slots/IPhantomSlot.java +++ b/common/buildcraft/core/gui/slots/IPhantomSlot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotArchitect.java b/common/buildcraft/core/gui/slots/SlotArchitect.java index 6f0747d0..0ab1ca06 100644 --- a/common/buildcraft/core/gui/slots/SlotArchitect.java +++ b/common/buildcraft/core/gui/slots/SlotArchitect.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotBase.java b/common/buildcraft/core/gui/slots/SlotBase.java index 0122b919..5c247cdb 100644 --- a/common/buildcraft/core/gui/slots/SlotBase.java +++ b/common/buildcraft/core/gui/slots/SlotBase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotBlueprintLibrary.java b/common/buildcraft/core/gui/slots/SlotBlueprintLibrary.java index 3ccfc902..5823bda7 100644 --- a/common/buildcraft/core/gui/slots/SlotBlueprintLibrary.java +++ b/common/buildcraft/core/gui/slots/SlotBlueprintLibrary.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotHidden.java b/common/buildcraft/core/gui/slots/SlotHidden.java index dd8c779f..6e5a46aa 100755 --- a/common/buildcraft/core/gui/slots/SlotHidden.java +++ b/common/buildcraft/core/gui/slots/SlotHidden.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotLimited.java b/common/buildcraft/core/gui/slots/SlotLimited.java index 57feedd9..4e066f71 100644 --- a/common/buildcraft/core/gui/slots/SlotLimited.java +++ b/common/buildcraft/core/gui/slots/SlotLimited.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotOutput.java b/common/buildcraft/core/gui/slots/SlotOutput.java index ede106b0..3bbe96d7 100644 --- a/common/buildcraft/core/gui/slots/SlotOutput.java +++ b/common/buildcraft/core/gui/slots/SlotOutput.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotPhantom.java b/common/buildcraft/core/gui/slots/SlotPhantom.java index f1857c81..6ea7b03a 100644 --- a/common/buildcraft/core/gui/slots/SlotPhantom.java +++ b/common/buildcraft/core/gui/slots/SlotPhantom.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotUntouchable.java b/common/buildcraft/core/gui/slots/SlotUntouchable.java index 8af0320e..a131c921 100644 --- a/common/buildcraft/core/gui/slots/SlotUntouchable.java +++ b/common/buildcraft/core/gui/slots/SlotUntouchable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotValidated.java b/common/buildcraft/core/gui/slots/SlotValidated.java index 26224485..62b79663 100644 --- a/common/buildcraft/core/gui/slots/SlotValidated.java +++ b/common/buildcraft/core/gui/slots/SlotValidated.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/slots/SlotWorkbench.java b/common/buildcraft/core/gui/slots/SlotWorkbench.java index 6273b3d7..bb9e7e61 100644 --- a/common/buildcraft/core/gui/slots/SlotWorkbench.java +++ b/common/buildcraft/core/gui/slots/SlotWorkbench.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/tooltips/IToolTipProvider.java b/common/buildcraft/core/gui/tooltips/IToolTipProvider.java index ad074b9e..33b81399 100644 --- a/common/buildcraft/core/gui/tooltips/IToolTipProvider.java +++ b/common/buildcraft/core/gui/tooltips/IToolTipProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/tooltips/ToolTip.java b/common/buildcraft/core/gui/tooltips/ToolTip.java index 69dc6bf3..42a0a040 100644 --- a/common/buildcraft/core/gui/tooltips/ToolTip.java +++ b/common/buildcraft/core/gui/tooltips/ToolTip.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/tooltips/ToolTipLine.java b/common/buildcraft/core/gui/tooltips/ToolTipLine.java index e6b2e69f..2abd24f7 100644 --- a/common/buildcraft/core/gui/tooltips/ToolTipLine.java +++ b/common/buildcraft/core/gui/tooltips/ToolTipLine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/widgets/ButtonWidget.java b/common/buildcraft/core/gui/widgets/ButtonWidget.java index da9a4364..9468f72c 100644 --- a/common/buildcraft/core/gui/widgets/ButtonWidget.java +++ b/common/buildcraft/core/gui/widgets/ButtonWidget.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/widgets/FluidGaugeWidget.java b/common/buildcraft/core/gui/widgets/FluidGaugeWidget.java index a5eae328..4e599eeb 100644 --- a/common/buildcraft/core/gui/widgets/FluidGaugeWidget.java +++ b/common/buildcraft/core/gui/widgets/FluidGaugeWidget.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/widgets/IIndicatorController.java b/common/buildcraft/core/gui/widgets/IIndicatorController.java index ffb1cfbf..adafaf4f 100644 --- a/common/buildcraft/core/gui/widgets/IIndicatorController.java +++ b/common/buildcraft/core/gui/widgets/IIndicatorController.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/widgets/IndicatorController.java b/common/buildcraft/core/gui/widgets/IndicatorController.java index 37384f49..645fdbb7 100644 --- a/common/buildcraft/core/gui/widgets/IndicatorController.java +++ b/common/buildcraft/core/gui/widgets/IndicatorController.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/widgets/IndicatorWidget.java b/common/buildcraft/core/gui/widgets/IndicatorWidget.java index a67ba097..1eb13ce1 100644 --- a/common/buildcraft/core/gui/widgets/IndicatorWidget.java +++ b/common/buildcraft/core/gui/widgets/IndicatorWidget.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/gui/widgets/Widget.java b/common/buildcraft/core/gui/widgets/Widget.java index ba773ac9..bb0e346c 100644 --- a/common/buildcraft/core/gui/widgets/Widget.java +++ b/common/buildcraft/core/gui/widgets/Widget.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/CrafterCopy.java b/common/buildcraft/core/inventory/CrafterCopy.java index afafc094..938e47e0 100644 --- a/common/buildcraft/core/inventory/CrafterCopy.java +++ b/common/buildcraft/core/inventory/CrafterCopy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/FluidHandlerCopy.java b/common/buildcraft/core/inventory/FluidHandlerCopy.java index 270e52e6..31da0e8e 100755 --- a/common/buildcraft/core/inventory/FluidHandlerCopy.java +++ b/common/buildcraft/core/inventory/FluidHandlerCopy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/ITransactor.java b/common/buildcraft/core/inventory/ITransactor.java index 954d8ab6..d76c6f63 100644 --- a/common/buildcraft/core/inventory/ITransactor.java +++ b/common/buildcraft/core/inventory/ITransactor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/InvUtils.java b/common/buildcraft/core/inventory/InvUtils.java index d34eb92c..f8a28601 100644 --- a/common/buildcraft/core/inventory/InvUtils.java +++ b/common/buildcraft/core/inventory/InvUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/InventoryConcatenator.java b/common/buildcraft/core/inventory/InventoryConcatenator.java index a1c07735..655d307c 100644 --- a/common/buildcraft/core/inventory/InventoryConcatenator.java +++ b/common/buildcraft/core/inventory/InventoryConcatenator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/InventoryCopy.java b/common/buildcraft/core/inventory/InventoryCopy.java index fb2ec3c7..0b1485b9 100644 --- a/common/buildcraft/core/inventory/InventoryCopy.java +++ b/common/buildcraft/core/inventory/InventoryCopy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/InventoryIterator.java b/common/buildcraft/core/inventory/InventoryIterator.java index 6f280404..865e08d6 100644 --- a/common/buildcraft/core/inventory/InventoryIterator.java +++ b/common/buildcraft/core/inventory/InventoryIterator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/InventoryIteratorSided.java b/common/buildcraft/core/inventory/InventoryIteratorSided.java index 9b9ac881..3b367d02 100644 --- a/common/buildcraft/core/inventory/InventoryIteratorSided.java +++ b/common/buildcraft/core/inventory/InventoryIteratorSided.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/InventoryIteratorSimple.java b/common/buildcraft/core/inventory/InventoryIteratorSimple.java index 844fa8a6..48e7f2ae 100644 --- a/common/buildcraft/core/inventory/InventoryIteratorSimple.java +++ b/common/buildcraft/core/inventory/InventoryIteratorSimple.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/InventoryMapper.java b/common/buildcraft/core/inventory/InventoryMapper.java index fcff04a0..6eb8ebba 100644 --- a/common/buildcraft/core/inventory/InventoryMapper.java +++ b/common/buildcraft/core/inventory/InventoryMapper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/InventoryWrapper.java b/common/buildcraft/core/inventory/InventoryWrapper.java index e3d2b5e2..5383b63a 100644 --- a/common/buildcraft/core/inventory/InventoryWrapper.java +++ b/common/buildcraft/core/inventory/InventoryWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/InventoryWrapperSimple.java b/common/buildcraft/core/inventory/InventoryWrapperSimple.java index 7310bfd3..c33c63ac 100644 --- a/common/buildcraft/core/inventory/InventoryWrapperSimple.java +++ b/common/buildcraft/core/inventory/InventoryWrapperSimple.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/SimpleInventory.java b/common/buildcraft/core/inventory/SimpleInventory.java index 4f475c81..66d37d2c 100644 --- a/common/buildcraft/core/inventory/SimpleInventory.java +++ b/common/buildcraft/core/inventory/SimpleInventory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/StackHelper.java b/common/buildcraft/core/inventory/StackHelper.java index 5ee2df4b..5ac30083 100644 --- a/common/buildcraft/core/inventory/StackHelper.java +++ b/common/buildcraft/core/inventory/StackHelper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/Transactor.java b/common/buildcraft/core/inventory/Transactor.java index c1aedb1e..02684421 100644 --- a/common/buildcraft/core/inventory/Transactor.java +++ b/common/buildcraft/core/inventory/Transactor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/TransactorRoundRobin.java b/common/buildcraft/core/inventory/TransactorRoundRobin.java index 14427fd7..c4f5019f 100644 --- a/common/buildcraft/core/inventory/TransactorRoundRobin.java +++ b/common/buildcraft/core/inventory/TransactorRoundRobin.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/TransactorSimple.java b/common/buildcraft/core/inventory/TransactorSimple.java index 4a256c3b..bfb12132 100644 --- a/common/buildcraft/core/inventory/TransactorSimple.java +++ b/common/buildcraft/core/inventory/TransactorSimple.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/AggregateFilter.java b/common/buildcraft/core/inventory/filters/AggregateFilter.java index 9df118a6..5ceec4d3 100644 --- a/common/buildcraft/core/inventory/filters/AggregateFilter.java +++ b/common/buildcraft/core/inventory/filters/AggregateFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java b/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java index 66146c7d..10755f39 100755 --- a/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java +++ b/common/buildcraft/core/inventory/filters/ArrayFluidFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/ArrayStackFilter.java b/common/buildcraft/core/inventory/filters/ArrayStackFilter.java index 44a2745e..f507ea3c 100644 --- a/common/buildcraft/core/inventory/filters/ArrayStackFilter.java +++ b/common/buildcraft/core/inventory/filters/ArrayStackFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/ArrayStackOrListFilter.java b/common/buildcraft/core/inventory/filters/ArrayStackOrListFilter.java index 25de7aaf..a90d02c9 100755 --- a/common/buildcraft/core/inventory/filters/ArrayStackOrListFilter.java +++ b/common/buildcraft/core/inventory/filters/ArrayStackOrListFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/CompositeFilter.java b/common/buildcraft/core/inventory/filters/CompositeFilter.java index 714acd29..e587e8fd 100755 --- a/common/buildcraft/core/inventory/filters/CompositeFilter.java +++ b/common/buildcraft/core/inventory/filters/CompositeFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/CraftingFilter.java b/common/buildcraft/core/inventory/filters/CraftingFilter.java index 944ab5ae..8e492425 100644 --- a/common/buildcraft/core/inventory/filters/CraftingFilter.java +++ b/common/buildcraft/core/inventory/filters/CraftingFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/IFluidFilter.java b/common/buildcraft/core/inventory/filters/IFluidFilter.java index 59c588e5..d2b78c91 100755 --- a/common/buildcraft/core/inventory/filters/IFluidFilter.java +++ b/common/buildcraft/core/inventory/filters/IFluidFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/IStackFilter.java b/common/buildcraft/core/inventory/filters/IStackFilter.java index d1e818f3..9ef0f5a5 100644 --- a/common/buildcraft/core/inventory/filters/IStackFilter.java +++ b/common/buildcraft/core/inventory/filters/IStackFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/InvertedStackFilter.java b/common/buildcraft/core/inventory/filters/InvertedStackFilter.java index e3432bd2..519a0356 100644 --- a/common/buildcraft/core/inventory/filters/InvertedStackFilter.java +++ b/common/buildcraft/core/inventory/filters/InvertedStackFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/OreStackFilter.java b/common/buildcraft/core/inventory/filters/OreStackFilter.java index a4b9fef3..6426f194 100755 --- a/common/buildcraft/core/inventory/filters/OreStackFilter.java +++ b/common/buildcraft/core/inventory/filters/OreStackFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/PassThroughFluidFilter.java b/common/buildcraft/core/inventory/filters/PassThroughFluidFilter.java index e01a09ac..fbe209b3 100755 --- a/common/buildcraft/core/inventory/filters/PassThroughFluidFilter.java +++ b/common/buildcraft/core/inventory/filters/PassThroughFluidFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/PassThroughStackFilter.java b/common/buildcraft/core/inventory/filters/PassThroughStackFilter.java index d28ff399..3066807a 100755 --- a/common/buildcraft/core/inventory/filters/PassThroughStackFilter.java +++ b/common/buildcraft/core/inventory/filters/PassThroughStackFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/SimpleFluidFilter.java b/common/buildcraft/core/inventory/filters/SimpleFluidFilter.java index 4bac8ddc..f4046b46 100755 --- a/common/buildcraft/core/inventory/filters/SimpleFluidFilter.java +++ b/common/buildcraft/core/inventory/filters/SimpleFluidFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/StackFilter.java b/common/buildcraft/core/inventory/filters/StackFilter.java index a293c94d..82ffd301 100644 --- a/common/buildcraft/core/inventory/filters/StackFilter.java +++ b/common/buildcraft/core/inventory/filters/StackFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java b/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java index c8b9192b..06ab3251 100755 --- a/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java +++ b/common/buildcraft/core/inventory/filters/StatementParameterStackFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/BuildCraftChannelHandler.java b/common/buildcraft/core/network/BuildCraftChannelHandler.java index 6387a2bb..73feb1a9 100755 --- a/common/buildcraft/core/network/BuildCraftChannelHandler.java +++ b/common/buildcraft/core/network/BuildCraftChannelHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/BuildCraftPacket.java b/common/buildcraft/core/network/BuildCraftPacket.java index 0ae818d9..52f1b2fc 100644 --- a/common/buildcraft/core/network/BuildCraftPacket.java +++ b/common/buildcraft/core/network/BuildCraftPacket.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/CommandTarget.java b/common/buildcraft/core/network/CommandTarget.java index 70107414..b4783b4a 100644 --- a/common/buildcraft/core/network/CommandTarget.java +++ b/common/buildcraft/core/network/CommandTarget.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/CommandTargetContainer.java b/common/buildcraft/core/network/CommandTargetContainer.java index cf375c91..b6d5de4c 100644 --- a/common/buildcraft/core/network/CommandTargetContainer.java +++ b/common/buildcraft/core/network/CommandTargetContainer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/CommandTargetEntity.java b/common/buildcraft/core/network/CommandTargetEntity.java index 82466587..a2f02dd0 100644 --- a/common/buildcraft/core/network/CommandTargetEntity.java +++ b/common/buildcraft/core/network/CommandTargetEntity.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/CommandTargetTile.java b/common/buildcraft/core/network/CommandTargetTile.java index ffaff308..abe1c0ae 100644 --- a/common/buildcraft/core/network/CommandTargetTile.java +++ b/common/buildcraft/core/network/CommandTargetTile.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/CommandWriter.java b/common/buildcraft/core/network/CommandWriter.java index e162ba27..b99d85c3 100644 --- a/common/buildcraft/core/network/CommandWriter.java +++ b/common/buildcraft/core/network/CommandWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/EntityIds.java b/common/buildcraft/core/network/EntityIds.java index 70ca4b7b..f4630c9a 100644 --- a/common/buildcraft/core/network/EntityIds.java +++ b/common/buildcraft/core/network/EntityIds.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/ICommandReceiver.java b/common/buildcraft/core/network/ICommandReceiver.java index 9e332a36..4e880f21 100644 --- a/common/buildcraft/core/network/ICommandReceiver.java +++ b/common/buildcraft/core/network/ICommandReceiver.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/IGuiReturnHandler.java b/common/buildcraft/core/network/IGuiReturnHandler.java index f1b7f78c..f36ee8de 100644 --- a/common/buildcraft/core/network/IGuiReturnHandler.java +++ b/common/buildcraft/core/network/IGuiReturnHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/ISyncedTile.java b/common/buildcraft/core/network/ISyncedTile.java index 3e105185..a7ff2879 100644 --- a/common/buildcraft/core/network/ISyncedTile.java +++ b/common/buildcraft/core/network/ISyncedTile.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/ISynchronizedTile.java b/common/buildcraft/core/network/ISynchronizedTile.java index 14d14e8a..eb4669bd 100644 --- a/common/buildcraft/core/network/ISynchronizedTile.java +++ b/common/buildcraft/core/network/ISynchronizedTile.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketCommand.java b/common/buildcraft/core/network/PacketCommand.java index cc9b0475..07203f68 100644 --- a/common/buildcraft/core/network/PacketCommand.java +++ b/common/buildcraft/core/network/PacketCommand.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketCoordinates.java b/common/buildcraft/core/network/PacketCoordinates.java index 301790fb..da7f1194 100644 --- a/common/buildcraft/core/network/PacketCoordinates.java +++ b/common/buildcraft/core/network/PacketCoordinates.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketGuiReturn.java b/common/buildcraft/core/network/PacketGuiReturn.java index 900bdd79..71071afc 100644 --- a/common/buildcraft/core/network/PacketGuiReturn.java +++ b/common/buildcraft/core/network/PacketGuiReturn.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketGuiWidget.java b/common/buildcraft/core/network/PacketGuiWidget.java index 60a8a563..df757a95 100644 --- a/common/buildcraft/core/network/PacketGuiWidget.java +++ b/common/buildcraft/core/network/PacketGuiWidget.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketHandler.java b/common/buildcraft/core/network/PacketHandler.java index 39e987ce..ce00e9f7 100644 --- a/common/buildcraft/core/network/PacketHandler.java +++ b/common/buildcraft/core/network/PacketHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketIds.java b/common/buildcraft/core/network/PacketIds.java index 6331228f..7ef2a2b5 100644 --- a/common/buildcraft/core/network/PacketIds.java +++ b/common/buildcraft/core/network/PacketIds.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketNBT.java b/common/buildcraft/core/network/PacketNBT.java index 131d9a8b..7f361df7 100644 --- a/common/buildcraft/core/network/PacketNBT.java +++ b/common/buildcraft/core/network/PacketNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketSlotChange.java b/common/buildcraft/core/network/PacketSlotChange.java index c74e5558..aceda76e 100644 --- a/common/buildcraft/core/network/PacketSlotChange.java +++ b/common/buildcraft/core/network/PacketSlotChange.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketTileState.java b/common/buildcraft/core/network/PacketTileState.java index 55b9c40b..6e6bb0de 100644 --- a/common/buildcraft/core/network/PacketTileState.java +++ b/common/buildcraft/core/network/PacketTileState.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketTileUpdate.java b/common/buildcraft/core/network/PacketTileUpdate.java index 464b7a77..ccd9b0c2 100644 --- a/common/buildcraft/core/network/PacketTileUpdate.java +++ b/common/buildcraft/core/network/PacketTileUpdate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/network/PacketUpdate.java b/common/buildcraft/core/network/PacketUpdate.java index 6b7218ea..db57b865 100644 --- a/common/buildcraft/core/network/PacketUpdate.java +++ b/common/buildcraft/core/network/PacketUpdate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/proxy/CoreProxy.java b/common/buildcraft/core/proxy/CoreProxy.java index 4bad708e..c6378318 100644 --- a/common/buildcraft/core/proxy/CoreProxy.java +++ b/common/buildcraft/core/proxy/CoreProxy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 606bc954..a3993868 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/recipes/AssemblyRecipeManager.java b/common/buildcraft/core/recipes/AssemblyRecipeManager.java index f0149bc5..15c992b0 100644 --- a/common/buildcraft/core/recipes/AssemblyRecipeManager.java +++ b/common/buildcraft/core/recipes/AssemblyRecipeManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/recipes/FlexibleRecipe.java b/common/buildcraft/core/recipes/FlexibleRecipe.java index e9d326a8..98ac2193 100644 --- a/common/buildcraft/core/recipes/FlexibleRecipe.java +++ b/common/buildcraft/core/recipes/FlexibleRecipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/recipes/IntegrationRecipeManager.java b/common/buildcraft/core/recipes/IntegrationRecipeManager.java index 6ad4c439..49880a20 100644 --- a/common/buildcraft/core/recipes/IntegrationRecipeManager.java +++ b/common/buildcraft/core/recipes/IntegrationRecipeManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/recipes/RefineryRecipeManager.java b/common/buildcraft/core/recipes/RefineryRecipeManager.java index a83d5309..a48b6846 100644 --- a/common/buildcraft/core/recipes/RefineryRecipeManager.java +++ b/common/buildcraft/core/recipes/RefineryRecipeManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/BlockHighlightHandler.java b/common/buildcraft/core/render/BlockHighlightHandler.java index bddd4f01..a55d2790 100644 --- a/common/buildcraft/core/render/BlockHighlightHandler.java +++ b/common/buildcraft/core/render/BlockHighlightHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/FluidRenderer.java b/common/buildcraft/core/render/FluidRenderer.java index 5b431e0f..99c2695a 100644 --- a/common/buildcraft/core/render/FluidRenderer.java +++ b/common/buildcraft/core/render/FluidRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderBox.java b/common/buildcraft/core/render/RenderBox.java index 45d61b69..817df024 100755 --- a/common/buildcraft/core/render/RenderBox.java +++ b/common/buildcraft/core/render/RenderBox.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderBoxProvider.java b/common/buildcraft/core/render/RenderBoxProvider.java index 060f4d42..823d90d9 100755 --- a/common/buildcraft/core/render/RenderBoxProvider.java +++ b/common/buildcraft/core/render/RenderBoxProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderBuilder.java b/common/buildcraft/core/render/RenderBuilder.java index e6734106..51463460 100755 --- a/common/buildcraft/core/render/RenderBuilder.java +++ b/common/buildcraft/core/render/RenderBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderBuildingItems.java b/common/buildcraft/core/render/RenderBuildingItems.java index d0f3c84e..d0aadd35 100755 --- a/common/buildcraft/core/render/RenderBuildingItems.java +++ b/common/buildcraft/core/render/RenderBuildingItems.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderEntityBlock.java b/common/buildcraft/core/render/RenderEntityBlock.java index f0fafe00..2f9f0e7a 100644 --- a/common/buildcraft/core/render/RenderEntityBlock.java +++ b/common/buildcraft/core/render/RenderEntityBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderLaser.java b/common/buildcraft/core/render/RenderLaser.java index bbe2c95e..ad4bd3be 100644 --- a/common/buildcraft/core/render/RenderLaser.java +++ b/common/buildcraft/core/render/RenderLaser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderUtils.java b/common/buildcraft/core/render/RenderUtils.java index 6717bf6a..4663b78d 100644 --- a/common/buildcraft/core/render/RenderUtils.java +++ b/common/buildcraft/core/render/RenderUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderVoid.java b/common/buildcraft/core/render/RenderVoid.java index 7960f227..7f53c1f0 100644 --- a/common/buildcraft/core/render/RenderVoid.java +++ b/common/buildcraft/core/render/RenderVoid.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderingEntityBlocks.java b/common/buildcraft/core/render/RenderingEntityBlocks.java index f4af0af1..4a77dd10 100644 --- a/common/buildcraft/core/render/RenderingEntityBlocks.java +++ b/common/buildcraft/core/render/RenderingEntityBlocks.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/render/RenderingMarkers.java b/common/buildcraft/core/render/RenderingMarkers.java index a8460f1f..9c6d54e2 100644 --- a/common/buildcraft/core/render/RenderingMarkers.java +++ b/common/buildcraft/core/render/RenderingMarkers.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/ActionMachineControl.java b/common/buildcraft/core/statements/ActionMachineControl.java index 537a5533..7877ca6c 100644 --- a/common/buildcraft/core/statements/ActionMachineControl.java +++ b/common/buildcraft/core/statements/ActionMachineControl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/ActionRedstoneOutput.java b/common/buildcraft/core/statements/ActionRedstoneOutput.java index c8819e90..ccb70ee2 100644 --- a/common/buildcraft/core/statements/ActionRedstoneOutput.java +++ b/common/buildcraft/core/statements/ActionRedstoneOutput.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/BCStatement.java b/common/buildcraft/core/statements/BCStatement.java index fff0b2ba..6ab1f810 100644 --- a/common/buildcraft/core/statements/BCStatement.java +++ b/common/buildcraft/core/statements/BCStatement.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/DefaultActionProvider.java b/common/buildcraft/core/statements/DefaultActionProvider.java index 8030bf81..13ba4ced 100644 --- a/common/buildcraft/core/statements/DefaultActionProvider.java +++ b/common/buildcraft/core/statements/DefaultActionProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/DefaultTriggerProvider.java b/common/buildcraft/core/statements/DefaultTriggerProvider.java index e885f893..ca6f5a22 100644 --- a/common/buildcraft/core/statements/DefaultTriggerProvider.java +++ b/common/buildcraft/core/statements/DefaultTriggerProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/StatementParameterDirection.java b/common/buildcraft/core/statements/StatementParameterDirection.java index ff5e1f28..6cb0be0f 100644 --- a/common/buildcraft/core/statements/StatementParameterDirection.java +++ b/common/buildcraft/core/statements/StatementParameterDirection.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/TriggerEnergy.java b/common/buildcraft/core/statements/TriggerEnergy.java index 888d054e..53992728 100644 --- a/common/buildcraft/core/statements/TriggerEnergy.java +++ b/common/buildcraft/core/statements/TriggerEnergy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java index c9f10198..d68b7d0f 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainer.java +++ b/common/buildcraft/core/statements/TriggerFluidContainer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java index 2d34b52c..98df2bea 100644 --- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java +++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/TriggerInventory.java b/common/buildcraft/core/statements/TriggerInventory.java index 65cd7c7b..87f25ad8 100644 --- a/common/buildcraft/core/statements/TriggerInventory.java +++ b/common/buildcraft/core/statements/TriggerInventory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/TriggerInventoryLevel.java b/common/buildcraft/core/statements/TriggerInventoryLevel.java index 57c1a308..f05f8a0d 100644 --- a/common/buildcraft/core/statements/TriggerInventoryLevel.java +++ b/common/buildcraft/core/statements/TriggerInventoryLevel.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/TriggerMachine.java b/common/buildcraft/core/statements/TriggerMachine.java index 0ae0e71e..89b346f1 100644 --- a/common/buildcraft/core/statements/TriggerMachine.java +++ b/common/buildcraft/core/statements/TriggerMachine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/statements/TriggerRedstoneInput.java b/common/buildcraft/core/statements/TriggerRedstoneInput.java index 9c36822d..9bbd8cba 100644 --- a/common/buildcraft/core/statements/TriggerRedstoneInput.java +++ b/common/buildcraft/core/statements/TriggerRedstoneInput.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/AverageUtil.java b/common/buildcraft/core/utils/AverageUtil.java index f9c011da..4fb5e9f5 100644 --- a/common/buildcraft/core/utils/AverageUtil.java +++ b/common/buildcraft/core/utils/AverageUtil.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/BlockUtils.java b/common/buildcraft/core/utils/BlockUtils.java index fadf1668..ce5da2c9 100644 --- a/common/buildcraft/core/utils/BlockUtils.java +++ b/common/buildcraft/core/utils/BlockUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/ChunkProperty.java b/common/buildcraft/core/utils/ChunkProperty.java index a360f239..1f585604 100755 --- a/common/buildcraft/core/utils/ChunkProperty.java +++ b/common/buildcraft/core/utils/ChunkProperty.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/ColorUtils.java b/common/buildcraft/core/utils/ColorUtils.java index 87187715..e97ad277 100644 --- a/common/buildcraft/core/utils/ColorUtils.java +++ b/common/buildcraft/core/utils/ColorUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/ConfigUtils.java b/common/buildcraft/core/utils/ConfigUtils.java index b1b7d421..c38bb228 100644 --- a/common/buildcraft/core/utils/ConfigUtils.java +++ b/common/buildcraft/core/utils/ConfigUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/CraftingHandler.java b/common/buildcraft/core/utils/CraftingHandler.java index 13739e04..c25743f0 100644 --- a/common/buildcraft/core/utils/CraftingHandler.java +++ b/common/buildcraft/core/utils/CraftingHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/CraftingHelper.java b/common/buildcraft/core/utils/CraftingHelper.java index f790a570..b8fd4fbf 100644 --- a/common/buildcraft/core/utils/CraftingHelper.java +++ b/common/buildcraft/core/utils/CraftingHelper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/DimensionProperty.java b/common/buildcraft/core/utils/DimensionProperty.java index eedb278a..286bab0f 100644 --- a/common/buildcraft/core/utils/DimensionProperty.java +++ b/common/buildcraft/core/utils/DimensionProperty.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/IBlockFilter.java b/common/buildcraft/core/utils/IBlockFilter.java index eddc33f7..8ed3874b 100755 --- a/common/buildcraft/core/utils/IBlockFilter.java +++ b/common/buildcraft/core/utils/IBlockFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/IEntityFilter.java b/common/buildcraft/core/utils/IEntityFilter.java index ee6352ce..189391b7 100755 --- a/common/buildcraft/core/utils/IEntityFilter.java +++ b/common/buildcraft/core/utils/IEntityFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/INBTTagable.java b/common/buildcraft/core/utils/INBTTagable.java index c3587b47..a3fb85a6 100644 --- a/common/buildcraft/core/utils/INBTTagable.java +++ b/common/buildcraft/core/utils/INBTTagable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/MathUtils.java b/common/buildcraft/core/utils/MathUtils.java index e5b3e733..8196deef 100644 --- a/common/buildcraft/core/utils/MathUtils.java +++ b/common/buildcraft/core/utils/MathUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/MatrixTranformations.java b/common/buildcraft/core/utils/MatrixTranformations.java index 57dfb22b..885d7fa6 100644 --- a/common/buildcraft/core/utils/MatrixTranformations.java +++ b/common/buildcraft/core/utils/MatrixTranformations.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/NBTUtils.java b/common/buildcraft/core/utils/NBTUtils.java index 7fdec735..248e0682 100644 --- a/common/buildcraft/core/utils/NBTUtils.java +++ b/common/buildcraft/core/utils/NBTUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/RevolvingList.java b/common/buildcraft/core/utils/RevolvingList.java index b1510cb7..a527a6bb 100644 --- a/common/buildcraft/core/utils/RevolvingList.java +++ b/common/buildcraft/core/utils/RevolvingList.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/SessionVars.java b/common/buildcraft/core/utils/SessionVars.java index 6390eece..559210fc 100644 --- a/common/buildcraft/core/utils/SessionVars.java +++ b/common/buildcraft/core/utils/SessionVars.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/StringUtils.java b/common/buildcraft/core/utils/StringUtils.java index 22626d72..27daa610 100644 --- a/common/buildcraft/core/utils/StringUtils.java +++ b/common/buildcraft/core/utils/StringUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/Utils.java b/common/buildcraft/core/utils/Utils.java index b25d942d..ada3d17d 100644 --- a/common/buildcraft/core/utils/Utils.java +++ b/common/buildcraft/core/utils/Utils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldProperty.java b/common/buildcraft/core/utils/WorldProperty.java index 62c5cd67..e2a27e83 100644 --- a/common/buildcraft/core/utils/WorldProperty.java +++ b/common/buildcraft/core/utils/WorldProperty.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldPropertyIsDirt.java b/common/buildcraft/core/utils/WorldPropertyIsDirt.java index 8761e3f9..bd045c0e 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsDirt.java +++ b/common/buildcraft/core/utils/WorldPropertyIsDirt.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldPropertyIsFarmland.java b/common/buildcraft/core/utils/WorldPropertyIsFarmland.java index 2b32c8b8..f8b4e192 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsFarmland.java +++ b/common/buildcraft/core/utils/WorldPropertyIsFarmland.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldPropertyIsFluidSource.java b/common/buildcraft/core/utils/WorldPropertyIsFluidSource.java index efd48b86..69762fea 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsFluidSource.java +++ b/common/buildcraft/core/utils/WorldPropertyIsFluidSource.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldPropertyIsHarvestable.java b/common/buildcraft/core/utils/WorldPropertyIsHarvestable.java index d4fe87bb..171c6dce 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsHarvestable.java +++ b/common/buildcraft/core/utils/WorldPropertyIsHarvestable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldPropertyIsLeaf.java b/common/buildcraft/core/utils/WorldPropertyIsLeaf.java index 11d5454a..8f590f4e 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsLeaf.java +++ b/common/buildcraft/core/utils/WorldPropertyIsLeaf.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldPropertyIsOre.java b/common/buildcraft/core/utils/WorldPropertyIsOre.java index 54d86bbf..44dd23ba 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsOre.java +++ b/common/buildcraft/core/utils/WorldPropertyIsOre.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldPropertyIsShoveled.java b/common/buildcraft/core/utils/WorldPropertyIsShoveled.java index c753309f..6b1adf63 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsShoveled.java +++ b/common/buildcraft/core/utils/WorldPropertyIsShoveled.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldPropertyIsSoft.java b/common/buildcraft/core/utils/WorldPropertyIsSoft.java index bbd6be5a..1dc41c7d 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsSoft.java +++ b/common/buildcraft/core/utils/WorldPropertyIsSoft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/WorldPropertyIsWood.java b/common/buildcraft/core/utils/WorldPropertyIsWood.java index 07cca9f0..f0d7b594 100755 --- a/common/buildcraft/core/utils/WorldPropertyIsWood.java +++ b/common/buildcraft/core/utils/WorldPropertyIsWood.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java b/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java index 82b0272e..8c17099f 100644 --- a/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java +++ b/common/buildcraft/core/utils/concurrency/IIterableAlgorithm.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/concurrency/IterableAlgorithmRunner.java b/common/buildcraft/core/utils/concurrency/IterableAlgorithmRunner.java index 0ca1d528..11aed2a5 100755 --- a/common/buildcraft/core/utils/concurrency/IterableAlgorithmRunner.java +++ b/common/buildcraft/core/utils/concurrency/IterableAlgorithmRunner.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/concurrency/PathFinding.java b/common/buildcraft/core/utils/concurrency/PathFinding.java index 76e78b82..0b5c0ac2 100755 --- a/common/buildcraft/core/utils/concurrency/PathFinding.java +++ b/common/buildcraft/core/utils/concurrency/PathFinding.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/core/utils/concurrency/PathFindingSearch.java b/common/buildcraft/core/utils/concurrency/PathFindingSearch.java index dec6e209..e89c77e9 100644 --- a/common/buildcraft/core/utils/concurrency/PathFindingSearch.java +++ b/common/buildcraft/core/utils/concurrency/PathFindingSearch.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/BlockBuildcraftFluid.java b/common/buildcraft/energy/BlockBuildcraftFluid.java index 84ff3c79..6deea478 100644 --- a/common/buildcraft/energy/BlockBuildcraftFluid.java +++ b/common/buildcraft/energy/BlockBuildcraftFluid.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/BlockEnergyEmitter.java b/common/buildcraft/energy/BlockEnergyEmitter.java index 7ea463b1..0bbb36e6 100755 --- a/common/buildcraft/energy/BlockEnergyEmitter.java +++ b/common/buildcraft/energy/BlockEnergyEmitter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/BlockEnergyReceiver.java b/common/buildcraft/energy/BlockEnergyReceiver.java index 3874b81f..64cb2f0b 100755 --- a/common/buildcraft/energy/BlockEnergyReceiver.java +++ b/common/buildcraft/energy/BlockEnergyReceiver.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/energy/BlockEngine.java index 9ef0151e..88b2eeb5 100644 --- a/common/buildcraft/energy/BlockEngine.java +++ b/common/buildcraft/energy/BlockEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/BucketHandler.java b/common/buildcraft/energy/BucketHandler.java index 75e9c3f0..097f540a 100644 --- a/common/buildcraft/energy/BucketHandler.java +++ b/common/buildcraft/energy/BucketHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/EnergyProxy.java b/common/buildcraft/energy/EnergyProxy.java index 30f0ed61..f4254e8b 100644 --- a/common/buildcraft/energy/EnergyProxy.java +++ b/common/buildcraft/energy/EnergyProxy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/EnergyProxyClient.java b/common/buildcraft/energy/EnergyProxyClient.java index 91226c09..3f0859db 100644 --- a/common/buildcraft/energy/EnergyProxyClient.java +++ b/common/buildcraft/energy/EnergyProxyClient.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/GuiHandler.java b/common/buildcraft/energy/GuiHandler.java index 52633e49..1f3c7975 100644 --- a/common/buildcraft/energy/GuiHandler.java +++ b/common/buildcraft/energy/GuiHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/ItemBucketBuildcraft.java b/common/buildcraft/energy/ItemBucketBuildcraft.java index b5c59718..57500a33 100644 --- a/common/buildcraft/energy/ItemBucketBuildcraft.java +++ b/common/buildcraft/energy/ItemBucketBuildcraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/ItemEngine.java b/common/buildcraft/energy/ItemEngine.java index 72a11790..c657b39f 100644 --- a/common/buildcraft/energy/ItemEngine.java +++ b/common/buildcraft/energy/ItemEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/SchematicEngine.java b/common/buildcraft/energy/SchematicEngine.java index b9996f11..b123b17c 100644 --- a/common/buildcraft/energy/SchematicEngine.java +++ b/common/buildcraft/energy/SchematicEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/TileEnergyEmitter.java b/common/buildcraft/energy/TileEnergyEmitter.java index 61e8a697..8c8093e1 100644 --- a/common/buildcraft/energy/TileEnergyEmitter.java +++ b/common/buildcraft/energy/TileEnergyEmitter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/TileEnergyReceiver.java b/common/buildcraft/energy/TileEnergyReceiver.java index 086d22b4..c433109c 100644 --- a/common/buildcraft/energy/TileEnergyReceiver.java +++ b/common/buildcraft/energy/TileEnergyReceiver.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java index 526d582f..ee26711c 100644 --- a/common/buildcraft/energy/TileEngine.java +++ b/common/buildcraft/energy/TileEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/TileEngineCreative.java b/common/buildcraft/energy/TileEngineCreative.java index 9c772537..c28a1b5d 100644 --- a/common/buildcraft/energy/TileEngineCreative.java +++ b/common/buildcraft/energy/TileEngineCreative.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java index f113ac24..c800641e 100644 --- a/common/buildcraft/energy/TileEngineIron.java +++ b/common/buildcraft/energy/TileEngineIron.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/TileEngineStone.java b/common/buildcraft/energy/TileEngineStone.java index f72dada5..dcd2acaf 100644 --- a/common/buildcraft/energy/TileEngineStone.java +++ b/common/buildcraft/energy/TileEngineStone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/TileEngineWithInventory.java b/common/buildcraft/energy/TileEngineWithInventory.java index e2f03bbf..5f527fb1 100644 --- a/common/buildcraft/energy/TileEngineWithInventory.java +++ b/common/buildcraft/energy/TileEngineWithInventory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/TileEngineWood.java b/common/buildcraft/energy/TileEngineWood.java index 42f94f95..204065fa 100644 --- a/common/buildcraft/energy/TileEngineWood.java +++ b/common/buildcraft/energy/TileEngineWood.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/fuels/CoolantManager.java b/common/buildcraft/energy/fuels/CoolantManager.java index c3148dce..3cd1828d 100644 --- a/common/buildcraft/energy/fuels/CoolantManager.java +++ b/common/buildcraft/energy/fuels/CoolantManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/fuels/FuelManager.java b/common/buildcraft/energy/fuels/FuelManager.java index b958ca12..54d145bc 100644 --- a/common/buildcraft/energy/fuels/FuelManager.java +++ b/common/buildcraft/energy/fuels/FuelManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/gui/ContainerEngine.java b/common/buildcraft/energy/gui/ContainerEngine.java index 55c20dd3..4c306f13 100644 --- a/common/buildcraft/energy/gui/ContainerEngine.java +++ b/common/buildcraft/energy/gui/ContainerEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/gui/GuiCombustionEngine.java b/common/buildcraft/energy/gui/GuiCombustionEngine.java index 5e8dbe7c..f5b6b686 100644 --- a/common/buildcraft/energy/gui/GuiCombustionEngine.java +++ b/common/buildcraft/energy/gui/GuiCombustionEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/gui/GuiEngine.java b/common/buildcraft/energy/gui/GuiEngine.java index e7b4e508..7820cb80 100644 --- a/common/buildcraft/energy/gui/GuiEngine.java +++ b/common/buildcraft/energy/gui/GuiEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/gui/GuiStoneEngine.java b/common/buildcraft/energy/gui/GuiStoneEngine.java index a72c8bf8..e0095762 100644 --- a/common/buildcraft/energy/gui/GuiStoneEngine.java +++ b/common/buildcraft/energy/gui/GuiStoneEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/render/EntityDropParticleFX.java b/common/buildcraft/energy/render/EntityDropParticleFX.java index 2c9e41a1..a0e89645 100644 --- a/common/buildcraft/energy/render/EntityDropParticleFX.java +++ b/common/buildcraft/energy/render/EntityDropParticleFX.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/render/RenderEnergyEmitter.java b/common/buildcraft/energy/render/RenderEnergyEmitter.java index c35a35c2..933e80ce 100755 --- a/common/buildcraft/energy/render/RenderEnergyEmitter.java +++ b/common/buildcraft/energy/render/RenderEnergyEmitter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/render/RenderEngine.java b/common/buildcraft/energy/render/RenderEngine.java index afefd538..761d37a9 100644 --- a/common/buildcraft/energy/render/RenderEngine.java +++ b/common/buildcraft/energy/render/RenderEngine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/statements/EnergyStatementProvider.java b/common/buildcraft/energy/statements/EnergyStatementProvider.java index 2d8907c3..c878699e 100644 --- a/common/buildcraft/energy/statements/EnergyStatementProvider.java +++ b/common/buildcraft/energy/statements/EnergyStatementProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/statements/TriggerEngineHeat.java b/common/buildcraft/energy/statements/TriggerEngineHeat.java index 60c473e9..652f3a76 100644 --- a/common/buildcraft/energy/statements/TriggerEngineHeat.java +++ b/common/buildcraft/energy/statements/TriggerEngineHeat.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java b/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java index 00da06c1..8e307307 100644 --- a/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java +++ b/common/buildcraft/energy/worldgen/BiomeGenOilDesert.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/worldgen/BiomeGenOilOcean.java b/common/buildcraft/energy/worldgen/BiomeGenOilOcean.java index ade1a65e..4bdaf545 100644 --- a/common/buildcraft/energy/worldgen/BiomeGenOilOcean.java +++ b/common/buildcraft/energy/worldgen/BiomeGenOilOcean.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/worldgen/BiomeInitializer.java b/common/buildcraft/energy/worldgen/BiomeInitializer.java index 763ad33c..6e2adf26 100644 --- a/common/buildcraft/energy/worldgen/BiomeInitializer.java +++ b/common/buildcraft/energy/worldgen/BiomeInitializer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java b/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java index 25a25589..6570c1c2 100644 --- a/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java +++ b/common/buildcraft/energy/worldgen/GenLayerAddOilDesert.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java b/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java index 672d62d8..0bea71a0 100644 --- a/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java +++ b/common/buildcraft/energy/worldgen/GenLayerAddOilOcean.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java b/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java index da273ada..0b0591bb 100644 --- a/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java +++ b/common/buildcraft/energy/worldgen/GenLayerBiomeReplacer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/worldgen/OilPopulate.java b/common/buildcraft/energy/worldgen/OilPopulate.java index 509c1a01..ffe814b1 100644 --- a/common/buildcraft/energy/worldgen/OilPopulate.java +++ b/common/buildcraft/energy/worldgen/OilPopulate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/energy/worldgen/SimplexNoise.java b/common/buildcraft/energy/worldgen/SimplexNoise.java index 795a3414..93730abf 100644 --- a/common/buildcraft/energy/worldgen/SimplexNoise.java +++ b/common/buildcraft/energy/worldgen/SimplexNoise.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java index e0582604..266cff36 100644 --- a/common/buildcraft/factory/BlockAutoWorkbench.java +++ b/common/buildcraft/factory/BlockAutoWorkbench.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockFloodGate.java b/common/buildcraft/factory/BlockFloodGate.java index 7ab7ac92..1fa1c80f 100644 --- a/common/buildcraft/factory/BlockFloodGate.java +++ b/common/buildcraft/factory/BlockFloodGate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java index 0297b046..4188469f 100644 --- a/common/buildcraft/factory/BlockFrame.java +++ b/common/buildcraft/factory/BlockFrame.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java index 740b8f2d..76f07087 100644 --- a/common/buildcraft/factory/BlockHopper.java +++ b/common/buildcraft/factory/BlockHopper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockMiningWell.java b/common/buildcraft/factory/BlockMiningWell.java index 2b18183f..23775b64 100644 --- a/common/buildcraft/factory/BlockMiningWell.java +++ b/common/buildcraft/factory/BlockMiningWell.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockPlainPipe.java b/common/buildcraft/factory/BlockPlainPipe.java index dd42381a..339d975c 100644 --- a/common/buildcraft/factory/BlockPlainPipe.java +++ b/common/buildcraft/factory/BlockPlainPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockPump.java b/common/buildcraft/factory/BlockPump.java index 95cb65c9..b1777b1c 100644 --- a/common/buildcraft/factory/BlockPump.java +++ b/common/buildcraft/factory/BlockPump.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java index 1b6cd195..12e752b3 100644 --- a/common/buildcraft/factory/BlockQuarry.java +++ b/common/buildcraft/factory/BlockQuarry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockRefinery.java b/common/buildcraft/factory/BlockRefinery.java index ef8c55b7..bc49875a 100644 --- a/common/buildcraft/factory/BlockRefinery.java +++ b/common/buildcraft/factory/BlockRefinery.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java index b4f23419..b776c8cf 100644 --- a/common/buildcraft/factory/BlockTank.java +++ b/common/buildcraft/factory/BlockTank.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/EntityMechanicalArm.java b/common/buildcraft/factory/EntityMechanicalArm.java index f4d27970..56a1608f 100644 --- a/common/buildcraft/factory/EntityMechanicalArm.java +++ b/common/buildcraft/factory/EntityMechanicalArm.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/FactoryProxy.java b/common/buildcraft/factory/FactoryProxy.java index b6ab8899..5b50dd8e 100644 --- a/common/buildcraft/factory/FactoryProxy.java +++ b/common/buildcraft/factory/FactoryProxy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/FactoryProxyClient.java b/common/buildcraft/factory/FactoryProxyClient.java index 3c478b51..322a801c 100644 --- a/common/buildcraft/factory/FactoryProxyClient.java +++ b/common/buildcraft/factory/FactoryProxyClient.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/GuiHandler.java b/common/buildcraft/factory/GuiHandler.java index cd499dc6..97b48631 100644 --- a/common/buildcraft/factory/GuiHandler.java +++ b/common/buildcraft/factory/GuiHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/PumpDimensionList.java b/common/buildcraft/factory/PumpDimensionList.java index 3863f238..b903816c 100644 --- a/common/buildcraft/factory/PumpDimensionList.java +++ b/common/buildcraft/factory/PumpDimensionList.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/TileAutoWorkbench.java b/common/buildcraft/factory/TileAutoWorkbench.java index 001c35bc..3fd19271 100644 --- a/common/buildcraft/factory/TileAutoWorkbench.java +++ b/common/buildcraft/factory/TileAutoWorkbench.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/TileFloodGate.java b/common/buildcraft/factory/TileFloodGate.java index 9d0993a4..6a0185b9 100644 --- a/common/buildcraft/factory/TileFloodGate.java +++ b/common/buildcraft/factory/TileFloodGate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/TileHopper.java b/common/buildcraft/factory/TileHopper.java index 87af15e8..f0b68a1a 100644 --- a/common/buildcraft/factory/TileHopper.java +++ b/common/buildcraft/factory/TileHopper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/TileMiningWell.java b/common/buildcraft/factory/TileMiningWell.java index 0d4691e0..4e885ee3 100644 --- a/common/buildcraft/factory/TileMiningWell.java +++ b/common/buildcraft/factory/TileMiningWell.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java index 9f642a86..26b9a090 100644 --- a/common/buildcraft/factory/TilePump.java +++ b/common/buildcraft/factory/TilePump.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java index 44801e33..5ae4de31 100644 --- a/common/buildcraft/factory/TileQuarry.java +++ b/common/buildcraft/factory/TileQuarry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/TileRefinery.java b/common/buildcraft/factory/TileRefinery.java index 892d2e89..7005f73c 100644 --- a/common/buildcraft/factory/TileRefinery.java +++ b/common/buildcraft/factory/TileRefinery.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java index 655e409b..3c65ff31 100644 --- a/common/buildcraft/factory/TileTank.java +++ b/common/buildcraft/factory/TileTank.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java index 88eaf551..5534cf9f 100644 --- a/common/buildcraft/factory/gui/ContainerAutoWorkbench.java +++ b/common/buildcraft/factory/gui/ContainerAutoWorkbench.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/gui/ContainerHopper.java b/common/buildcraft/factory/gui/ContainerHopper.java index 6989d35f..2a04a20f 100644 --- a/common/buildcraft/factory/gui/ContainerHopper.java +++ b/common/buildcraft/factory/gui/ContainerHopper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/gui/ContainerRefinery.java b/common/buildcraft/factory/gui/ContainerRefinery.java index 403015f8..ec79a1ea 100644 --- a/common/buildcraft/factory/gui/ContainerRefinery.java +++ b/common/buildcraft/factory/gui/ContainerRefinery.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/gui/GuiAutoCrafting.java b/common/buildcraft/factory/gui/GuiAutoCrafting.java index 84c5ecd2..58a1f406 100644 --- a/common/buildcraft/factory/gui/GuiAutoCrafting.java +++ b/common/buildcraft/factory/gui/GuiAutoCrafting.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/gui/GuiHopper.java b/common/buildcraft/factory/gui/GuiHopper.java index 41b4176d..86f7d3de 100644 --- a/common/buildcraft/factory/gui/GuiHopper.java +++ b/common/buildcraft/factory/gui/GuiHopper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/gui/GuiRefinery.java b/common/buildcraft/factory/gui/GuiRefinery.java index 3e8b2d33..5626e0f1 100644 --- a/common/buildcraft/factory/gui/GuiRefinery.java +++ b/common/buildcraft/factory/gui/GuiRefinery.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/network/PacketHandlerFactory.java b/common/buildcraft/factory/network/PacketHandlerFactory.java index 39b19cc2..84b2fcdd 100644 --- a/common/buildcraft/factory/network/PacketHandlerFactory.java +++ b/common/buildcraft/factory/network/PacketHandlerFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/render/ModelFrustum.java b/common/buildcraft/factory/render/ModelFrustum.java index 8d94dcad..185eba1e 100644 --- a/common/buildcraft/factory/render/ModelFrustum.java +++ b/common/buildcraft/factory/render/ModelFrustum.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/render/RenderHopper.java b/common/buildcraft/factory/render/RenderHopper.java index ed19edc2..9464726d 100644 --- a/common/buildcraft/factory/render/RenderHopper.java +++ b/common/buildcraft/factory/render/RenderHopper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/render/RenderRefinery.java b/common/buildcraft/factory/render/RenderRefinery.java index 7bcc0ea9..c034348d 100644 --- a/common/buildcraft/factory/render/RenderRefinery.java +++ b/common/buildcraft/factory/render/RenderRefinery.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/render/RenderTank.java b/common/buildcraft/factory/render/RenderTank.java index 0fd3626e..0606e10c 100644 --- a/common/buildcraft/factory/render/RenderTank.java +++ b/common/buildcraft/factory/render/RenderTank.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java b/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java index 65c5ae78..c16dbc36 100644 --- a/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java +++ b/common/buildcraft/factory/schematics/SchematicAutoWorkbench.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/schematics/SchematicPump.java b/common/buildcraft/factory/schematics/SchematicPump.java index 342aea13..a8e9a5c3 100755 --- a/common/buildcraft/factory/schematics/SchematicPump.java +++ b/common/buildcraft/factory/schematics/SchematicPump.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/schematics/SchematicRefinery.java b/common/buildcraft/factory/schematics/SchematicRefinery.java index 1b141db7..37ef58a5 100644 --- a/common/buildcraft/factory/schematics/SchematicRefinery.java +++ b/common/buildcraft/factory/schematics/SchematicRefinery.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/factory/schematics/SchematicTileIgnoreState.java b/common/buildcraft/factory/schematics/SchematicTileIgnoreState.java index cf6ebcc0..6a4c38a9 100644 --- a/common/buildcraft/factory/schematics/SchematicTileIgnoreState.java +++ b/common/buildcraft/factory/schematics/SchematicTileIgnoreState.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/DockingStation.java b/common/buildcraft/robots/DockingStation.java index 7748ed83..ef3a088e 100755 --- a/common/buildcraft/robots/DockingStation.java +++ b/common/buildcraft/robots/DockingStation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/EntityRobot.java b/common/buildcraft/robots/EntityRobot.java index 5720de36..6c9ba8cd 100644 --- a/common/buildcraft/robots/EntityRobot.java +++ b/common/buildcraft/robots/EntityRobot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/EntityRobotEnergyParticle.java b/common/buildcraft/robots/EntityRobotEnergyParticle.java index 597387e5..f44d1e54 100755 --- a/common/buildcraft/robots/EntityRobotEnergyParticle.java +++ b/common/buildcraft/robots/EntityRobotEnergyParticle.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/IStationFilter.java b/common/buildcraft/robots/IStationFilter.java index 177b583f..f1f8fe15 100755 --- a/common/buildcraft/robots/IStationFilter.java +++ b/common/buildcraft/robots/IStationFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ItemRobot.java b/common/buildcraft/robots/ItemRobot.java index f2d56040..622d7f6e 100755 --- a/common/buildcraft/robots/ItemRobot.java +++ b/common/buildcraft/robots/ItemRobot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ItemRobotStation.java b/common/buildcraft/robots/ItemRobotStation.java index d84e6334..7df991f5 100755 --- a/common/buildcraft/robots/ItemRobotStation.java +++ b/common/buildcraft/robots/ItemRobotStation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ResourceIdAssemblyTable.java b/common/buildcraft/robots/ResourceIdAssemblyTable.java index cd38c07c..5127c33e 100755 --- a/common/buildcraft/robots/ResourceIdAssemblyTable.java +++ b/common/buildcraft/robots/ResourceIdAssemblyTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ResourceIdBlock.java b/common/buildcraft/robots/ResourceIdBlock.java index 4825830b..32b0f089 100755 --- a/common/buildcraft/robots/ResourceIdBlock.java +++ b/common/buildcraft/robots/ResourceIdBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ResourceIdRequest.java b/common/buildcraft/robots/ResourceIdRequest.java index 66e8e2d0..d3391d7e 100755 --- a/common/buildcraft/robots/ResourceIdRequest.java +++ b/common/buildcraft/robots/ResourceIdRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/RobotIntegrationRecipe.java b/common/buildcraft/robots/RobotIntegrationRecipe.java index 147229fa..c695c90f 100755 --- a/common/buildcraft/robots/RobotIntegrationRecipe.java +++ b/common/buildcraft/robots/RobotIntegrationRecipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/RobotRegistry.java b/common/buildcraft/robots/RobotRegistry.java index 73873e12..2e11793f 100755 --- a/common/buildcraft/robots/RobotRegistry.java +++ b/common/buildcraft/robots/RobotRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/StationIndex.java b/common/buildcraft/robots/StationIndex.java index a704555a..a2c43f45 100755 --- a/common/buildcraft/robots/StationIndex.java +++ b/common/buildcraft/robots/StationIndex.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotAttack.java b/common/buildcraft/robots/ai/AIRobotAttack.java index 05f5381c..eea58acd 100755 --- a/common/buildcraft/robots/ai/AIRobotAttack.java +++ b/common/buildcraft/robots/ai/AIRobotAttack.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotBreak.java b/common/buildcraft/robots/ai/AIRobotBreak.java index c6e08c9b..02f710d1 100644 --- a/common/buildcraft/robots/ai/AIRobotBreak.java +++ b/common/buildcraft/robots/ai/AIRobotBreak.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java b/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java index 81d954dd..1694e708 100755 --- a/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java +++ b/common/buildcraft/robots/ai/AIRobotCraftAssemblyTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotCraftFurnace.java b/common/buildcraft/robots/ai/AIRobotCraftFurnace.java index fe71c65a..56090a92 100755 --- a/common/buildcraft/robots/ai/AIRobotCraftFurnace.java +++ b/common/buildcraft/robots/ai/AIRobotCraftFurnace.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotCraftGeneric.java b/common/buildcraft/robots/ai/AIRobotCraftGeneric.java index 6bd37de3..a6783bb6 100755 --- a/common/buildcraft/robots/ai/AIRobotCraftGeneric.java +++ b/common/buildcraft/robots/ai/AIRobotCraftGeneric.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotCraftWorkbench.java b/common/buildcraft/robots/ai/AIRobotCraftWorkbench.java index 3a358e4c..d4037aa6 100755 --- a/common/buildcraft/robots/ai/AIRobotCraftWorkbench.java +++ b/common/buildcraft/robots/ai/AIRobotCraftWorkbench.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotDeliverRequested.java b/common/buildcraft/robots/ai/AIRobotDeliverRequested.java index 5b33827c..d1b928fb 100755 --- a/common/buildcraft/robots/ai/AIRobotDeliverRequested.java +++ b/common/buildcraft/robots/ai/AIRobotDeliverRequested.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotDisposeItems.java b/common/buildcraft/robots/ai/AIRobotDisposeItems.java index e6c1c03b..1e90d327 100755 --- a/common/buildcraft/robots/ai/AIRobotDisposeItems.java +++ b/common/buildcraft/robots/ai/AIRobotDisposeItems.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotFetchAndEquipItemStack.java b/common/buildcraft/robots/ai/AIRobotFetchAndEquipItemStack.java index 5104cdb9..baf254e5 100755 --- a/common/buildcraft/robots/ai/AIRobotFetchAndEquipItemStack.java +++ b/common/buildcraft/robots/ai/AIRobotFetchAndEquipItemStack.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotFetchItem.java b/common/buildcraft/robots/ai/AIRobotFetchItem.java index e7c3d153..8a44f307 100755 --- a/common/buildcraft/robots/ai/AIRobotFetchItem.java +++ b/common/buildcraft/robots/ai/AIRobotFetchItem.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGoAndLinkToDock.java b/common/buildcraft/robots/ai/AIRobotGoAndLinkToDock.java index fcc405d4..762083ea 100755 --- a/common/buildcraft/robots/ai/AIRobotGoAndLinkToDock.java +++ b/common/buildcraft/robots/ai/AIRobotGoAndLinkToDock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGoto.java b/common/buildcraft/robots/ai/AIRobotGoto.java index 49abd9d3..dc78ca8e 100755 --- a/common/buildcraft/robots/ai/AIRobotGoto.java +++ b/common/buildcraft/robots/ai/AIRobotGoto.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoBlock.java b/common/buildcraft/robots/ai/AIRobotGotoBlock.java index 67a5fdf7..64f302d6 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoBlock.java +++ b/common/buildcraft/robots/ai/AIRobotGotoBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoSleep.java b/common/buildcraft/robots/ai/AIRobotGotoSleep.java index e77e7998..818547e9 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoSleep.java +++ b/common/buildcraft/robots/ai/AIRobotGotoSleep.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoStation.java b/common/buildcraft/robots/ai/AIRobotGotoStation.java index c3f46c0d..14e19fdc 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoStation.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoStationAndLoad.java b/common/buildcraft/robots/ai/AIRobotGotoStationAndLoad.java index 8b279436..acd79458 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoStationAndLoad.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationAndLoad.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoStationAndLoadFluids.java b/common/buildcraft/robots/ai/AIRobotGotoStationAndLoadFluids.java index de297acc..105d6394 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoStationAndLoadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationAndLoadFluids.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoStationAndUnload.java b/common/buildcraft/robots/ai/AIRobotGotoStationAndUnload.java index ac2d83ca..ffe85611 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoStationAndUnload.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationAndUnload.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoStationAndUnloadFluids.java b/common/buildcraft/robots/ai/AIRobotGotoStationAndUnloadFluids.java index aebedf62..47e99da5 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoStationAndUnloadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationAndUnloadFluids.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoStationToLoad.java b/common/buildcraft/robots/ai/AIRobotGotoStationToLoad.java index 34e795ba..f0e1fc9d 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoStationToLoad.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationToLoad.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoStationToLoadFluids.java b/common/buildcraft/robots/ai/AIRobotGotoStationToLoadFluids.java index 113a0f73..6a372f38 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoStationToLoadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationToLoadFluids.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoStationToUnload.java b/common/buildcraft/robots/ai/AIRobotGotoStationToUnload.java index de07cf57..c35fca95 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoStationToUnload.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationToUnload.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotGotoStationToUnloadFluids.java b/common/buildcraft/robots/ai/AIRobotGotoStationToUnloadFluids.java index 30dc892e..cb2d2f61 100755 --- a/common/buildcraft/robots/ai/AIRobotGotoStationToUnloadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotGotoStationToUnloadFluids.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotLoad.java b/common/buildcraft/robots/ai/AIRobotLoad.java index 1a49bb03..2b48b9ad 100755 --- a/common/buildcraft/robots/ai/AIRobotLoad.java +++ b/common/buildcraft/robots/ai/AIRobotLoad.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotLoadFluids.java b/common/buildcraft/robots/ai/AIRobotLoadFluids.java index a0e38d5d..8ab193c4 100755 --- a/common/buildcraft/robots/ai/AIRobotLoadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotLoadFluids.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotMain.java b/common/buildcraft/robots/ai/AIRobotMain.java index 018e428a..39098f81 100755 --- a/common/buildcraft/robots/ai/AIRobotMain.java +++ b/common/buildcraft/robots/ai/AIRobotMain.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotPumpBlock.java b/common/buildcraft/robots/ai/AIRobotPumpBlock.java index 79f0b442..8f70fb8f 100644 --- a/common/buildcraft/robots/ai/AIRobotPumpBlock.java +++ b/common/buildcraft/robots/ai/AIRobotPumpBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotRecharge.java b/common/buildcraft/robots/ai/AIRobotRecharge.java index f04e00e7..c6e8e7fc 100755 --- a/common/buildcraft/robots/ai/AIRobotRecharge.java +++ b/common/buildcraft/robots/ai/AIRobotRecharge.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotSearchAndGotoStation.java b/common/buildcraft/robots/ai/AIRobotSearchAndGotoStation.java index 0e0ac155..e18a4884 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchAndGotoStation.java +++ b/common/buildcraft/robots/ai/AIRobotSearchAndGotoStation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotSearchBlock.java b/common/buildcraft/robots/ai/AIRobotSearchBlock.java index 78f5d7f4..c86ee504 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotSearchEntity.java b/common/buildcraft/robots/ai/AIRobotSearchEntity.java index dc8c36ad..ed14a8bb 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchEntity.java +++ b/common/buildcraft/robots/ai/AIRobotSearchEntity.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotSearchRandomBlock.java b/common/buildcraft/robots/ai/AIRobotSearchRandomBlock.java index 9c551efc..1ab3023b 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchRandomBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchRandomBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java b/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java index 22a1a197..ac3ccf3c 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java +++ b/common/buildcraft/robots/ai/AIRobotSearchRandomGroundBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotSearchStackRequest.java b/common/buildcraft/robots/ai/AIRobotSearchStackRequest.java index 38510e8d..14e53b7e 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchStackRequest.java +++ b/common/buildcraft/robots/ai/AIRobotSearchStackRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotSearchStation.java b/common/buildcraft/robots/ai/AIRobotSearchStation.java index db8bbc6a..10c62ffa 100755 --- a/common/buildcraft/robots/ai/AIRobotSearchStation.java +++ b/common/buildcraft/robots/ai/AIRobotSearchStation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotSleep.java b/common/buildcraft/robots/ai/AIRobotSleep.java index 810306e5..a07194c7 100755 --- a/common/buildcraft/robots/ai/AIRobotSleep.java +++ b/common/buildcraft/robots/ai/AIRobotSleep.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java b/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java index 34e7c7d4..cb0cdee1 100755 --- a/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java +++ b/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotStripesHandler.java b/common/buildcraft/robots/ai/AIRobotStripesHandler.java index 878a991f..9b313c1f 100644 --- a/common/buildcraft/robots/ai/AIRobotStripesHandler.java +++ b/common/buildcraft/robots/ai/AIRobotStripesHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotUnload.java b/common/buildcraft/robots/ai/AIRobotUnload.java index 218e5d00..d711374f 100755 --- a/common/buildcraft/robots/ai/AIRobotUnload.java +++ b/common/buildcraft/robots/ai/AIRobotUnload.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotUnloadFluids.java b/common/buildcraft/robots/ai/AIRobotUnloadFluids.java index 1eabcf68..44b84747 100755 --- a/common/buildcraft/robots/ai/AIRobotUnloadFluids.java +++ b/common/buildcraft/robots/ai/AIRobotUnloadFluids.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java b/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java index eb6bfba3..7b1e8b15 100755 --- a/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java +++ b/common/buildcraft/robots/ai/AIRobotUseToolOnBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotBomber.java b/common/buildcraft/robots/boards/BoardRobotBomber.java index edfb1bdd..8f2ab744 100755 --- a/common/buildcraft/robots/boards/BoardRobotBomber.java +++ b/common/buildcraft/robots/boards/BoardRobotBomber.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotBomberNBT.java b/common/buildcraft/robots/boards/BoardRobotBomberNBT.java index df1d3e16..6f08823a 100755 --- a/common/buildcraft/robots/boards/BoardRobotBomberNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotBomberNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotBuilder.java b/common/buildcraft/robots/boards/BoardRobotBuilder.java index bfe0116f..3f8b2bdd 100644 --- a/common/buildcraft/robots/boards/BoardRobotBuilder.java +++ b/common/buildcraft/robots/boards/BoardRobotBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotBuilderNBT.java b/common/buildcraft/robots/boards/BoardRobotBuilderNBT.java index a0f037f9..7ab7cd55 100755 --- a/common/buildcraft/robots/boards/BoardRobotBuilderNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotBuilderNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotButcher.java b/common/buildcraft/robots/boards/BoardRobotButcher.java index 39f1fbc0..b2ef9a98 100755 --- a/common/buildcraft/robots/boards/BoardRobotButcher.java +++ b/common/buildcraft/robots/boards/BoardRobotButcher.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotButcherNBT.java b/common/buildcraft/robots/boards/BoardRobotButcherNBT.java index 893c96c9..9e7a9926 100755 --- a/common/buildcraft/robots/boards/BoardRobotButcherNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotButcherNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotCarrier.java b/common/buildcraft/robots/boards/BoardRobotCarrier.java index 32ac8c08..a7fda23c 100755 --- a/common/buildcraft/robots/boards/BoardRobotCarrier.java +++ b/common/buildcraft/robots/boards/BoardRobotCarrier.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotCarrierNBT.java b/common/buildcraft/robots/boards/BoardRobotCarrierNBT.java index 4d3c470b..21d77d2d 100755 --- a/common/buildcraft/robots/boards/BoardRobotCarrierNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotCarrierNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotCrafter.java b/common/buildcraft/robots/boards/BoardRobotCrafter.java index 8d780aa7..61985c15 100755 --- a/common/buildcraft/robots/boards/BoardRobotCrafter.java +++ b/common/buildcraft/robots/boards/BoardRobotCrafter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotCrafterNBT.java b/common/buildcraft/robots/boards/BoardRobotCrafterNBT.java index 553ca91e..0ab195ed 100755 --- a/common/buildcraft/robots/boards/BoardRobotCrafterNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotCrafterNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotDelivery.java b/common/buildcraft/robots/boards/BoardRobotDelivery.java index 196ac3e3..ef88a958 100755 --- a/common/buildcraft/robots/boards/BoardRobotDelivery.java +++ b/common/buildcraft/robots/boards/BoardRobotDelivery.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotDeliveryNBT.java b/common/buildcraft/robots/boards/BoardRobotDeliveryNBT.java index 7bea8e89..d1d51dc7 100755 --- a/common/buildcraft/robots/boards/BoardRobotDeliveryNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotDeliveryNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotFarmer.java b/common/buildcraft/robots/boards/BoardRobotFarmer.java index 63c0480b..caec42f1 100644 --- a/common/buildcraft/robots/boards/BoardRobotFarmer.java +++ b/common/buildcraft/robots/boards/BoardRobotFarmer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotFarmerNBT.java b/common/buildcraft/robots/boards/BoardRobotFarmerNBT.java index 5fce988e..88d15594 100755 --- a/common/buildcraft/robots/boards/BoardRobotFarmerNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotFarmerNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotFluidCarrier.java b/common/buildcraft/robots/boards/BoardRobotFluidCarrier.java index a0bd15f0..f6ee79a4 100755 --- a/common/buildcraft/robots/boards/BoardRobotFluidCarrier.java +++ b/common/buildcraft/robots/boards/BoardRobotFluidCarrier.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotFluidCarrierNBT.java b/common/buildcraft/robots/boards/BoardRobotFluidCarrierNBT.java index 153f53f5..b6320ed0 100755 --- a/common/buildcraft/robots/boards/BoardRobotFluidCarrierNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotFluidCarrierNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java index 55fc50f7..dd1ee60c 100644 --- a/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java +++ b/common/buildcraft/robots/boards/BoardRobotGenericBreakBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotHarvester.java b/common/buildcraft/robots/boards/BoardRobotHarvester.java index 6fabc682..7e3fa168 100755 --- a/common/buildcraft/robots/boards/BoardRobotHarvester.java +++ b/common/buildcraft/robots/boards/BoardRobotHarvester.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotHarvesterNBT.java b/common/buildcraft/robots/boards/BoardRobotHarvesterNBT.java index 770e6aaa..d9d88256 100755 --- a/common/buildcraft/robots/boards/BoardRobotHarvesterNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotHarvesterNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotKnight.java b/common/buildcraft/robots/boards/BoardRobotKnight.java index fad0f148..3bf03662 100755 --- a/common/buildcraft/robots/boards/BoardRobotKnight.java +++ b/common/buildcraft/robots/boards/BoardRobotKnight.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotKnightNBT.java b/common/buildcraft/robots/boards/BoardRobotKnightNBT.java index 3792bb71..419df464 100755 --- a/common/buildcraft/robots/boards/BoardRobotKnightNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotKnightNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotLeaveCutter.java b/common/buildcraft/robots/boards/BoardRobotLeaveCutter.java index e5cb4408..f97236ad 100755 --- a/common/buildcraft/robots/boards/BoardRobotLeaveCutter.java +++ b/common/buildcraft/robots/boards/BoardRobotLeaveCutter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotLeaveCutterNBT.java b/common/buildcraft/robots/boards/BoardRobotLeaveCutterNBT.java index ed3f8131..4b254298 100755 --- a/common/buildcraft/robots/boards/BoardRobotLeaveCutterNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotLeaveCutterNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotLumberjack.java b/common/buildcraft/robots/boards/BoardRobotLumberjack.java index a71765a2..63c0d40c 100755 --- a/common/buildcraft/robots/boards/BoardRobotLumberjack.java +++ b/common/buildcraft/robots/boards/BoardRobotLumberjack.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotLumberjackNBT.java b/common/buildcraft/robots/boards/BoardRobotLumberjackNBT.java index 010c6aca..4e223dc6 100755 --- a/common/buildcraft/robots/boards/BoardRobotLumberjackNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotLumberjackNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotMiner.java b/common/buildcraft/robots/boards/BoardRobotMiner.java index 28149efe..4787a7e0 100755 --- a/common/buildcraft/robots/boards/BoardRobotMiner.java +++ b/common/buildcraft/robots/boards/BoardRobotMiner.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotMinerNBT.java b/common/buildcraft/robots/boards/BoardRobotMinerNBT.java index 14012f7c..2e85d5e2 100755 --- a/common/buildcraft/robots/boards/BoardRobotMinerNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotMinerNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotPicker.java b/common/buildcraft/robots/boards/BoardRobotPicker.java index 9273c857..e16d6344 100755 --- a/common/buildcraft/robots/boards/BoardRobotPicker.java +++ b/common/buildcraft/robots/boards/BoardRobotPicker.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotPickerNBT.java b/common/buildcraft/robots/boards/BoardRobotPickerNBT.java index 6703c6de..7f36efc9 100755 --- a/common/buildcraft/robots/boards/BoardRobotPickerNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotPickerNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotPlanter.java b/common/buildcraft/robots/boards/BoardRobotPlanter.java index 4f2cf4e9..9ca92700 100644 --- a/common/buildcraft/robots/boards/BoardRobotPlanter.java +++ b/common/buildcraft/robots/boards/BoardRobotPlanter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotPlanterNBT.java b/common/buildcraft/robots/boards/BoardRobotPlanterNBT.java index f78499fa..e51b18e7 100755 --- a/common/buildcraft/robots/boards/BoardRobotPlanterNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotPlanterNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotPump.java b/common/buildcraft/robots/boards/BoardRobotPump.java index 21e7abe3..3fbcaa25 100644 --- a/common/buildcraft/robots/boards/BoardRobotPump.java +++ b/common/buildcraft/robots/boards/BoardRobotPump.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotPumpNBT.java b/common/buildcraft/robots/boards/BoardRobotPumpNBT.java index 748f4d90..ee50aa4d 100755 --- a/common/buildcraft/robots/boards/BoardRobotPumpNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotPumpNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotShovelman.java b/common/buildcraft/robots/boards/BoardRobotShovelman.java index 32ed54a1..d80c6479 100755 --- a/common/buildcraft/robots/boards/BoardRobotShovelman.java +++ b/common/buildcraft/robots/boards/BoardRobotShovelman.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotShovelmanNBT.java b/common/buildcraft/robots/boards/BoardRobotShovelmanNBT.java index f30f3ece..87ac37a6 100755 --- a/common/buildcraft/robots/boards/BoardRobotShovelmanNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotShovelmanNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotStripes.java b/common/buildcraft/robots/boards/BoardRobotStripes.java index 35c6bd3b..a6f7c463 100644 --- a/common/buildcraft/robots/boards/BoardRobotStripes.java +++ b/common/buildcraft/robots/boards/BoardRobotStripes.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/boards/BoardRobotStripesNBT.java b/common/buildcraft/robots/boards/BoardRobotStripesNBT.java index e89b3c2e..77ea7d4f 100644 --- a/common/buildcraft/robots/boards/BoardRobotStripesNBT.java +++ b/common/buildcraft/robots/boards/BoardRobotStripesNBT.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/render/RenderRobot.java b/common/buildcraft/robots/render/RenderRobot.java index ef5a42f4..70a7536a 100644 --- a/common/buildcraft/robots/render/RenderRobot.java +++ b/common/buildcraft/robots/render/RenderRobot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionRobotFilter.java b/common/buildcraft/robots/statements/ActionRobotFilter.java index b45ba39e..0989c1ad 100755 --- a/common/buildcraft/robots/statements/ActionRobotFilter.java +++ b/common/buildcraft/robots/statements/ActionRobotFilter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionRobotFilterTool.java b/common/buildcraft/robots/statements/ActionRobotFilterTool.java index 4567fb89..4b669ac8 100644 --- a/common/buildcraft/robots/statements/ActionRobotFilterTool.java +++ b/common/buildcraft/robots/statements/ActionRobotFilterTool.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionRobotGotoStation.java b/common/buildcraft/robots/statements/ActionRobotGotoStation.java index 00abfa42..9575e502 100644 --- a/common/buildcraft/robots/statements/ActionRobotGotoStation.java +++ b/common/buildcraft/robots/statements/ActionRobotGotoStation.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionRobotWakeUp.java b/common/buildcraft/robots/statements/ActionRobotWakeUp.java index 98e43445..783b5955 100755 --- a/common/buildcraft/robots/statements/ActionRobotWakeUp.java +++ b/common/buildcraft/robots/statements/ActionRobotWakeUp.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionRobotWorkInArea.java b/common/buildcraft/robots/statements/ActionRobotWorkInArea.java index 82108042..0528549f 100755 --- a/common/buildcraft/robots/statements/ActionRobotWorkInArea.java +++ b/common/buildcraft/robots/statements/ActionRobotWorkInArea.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationAcceptFluids.java b/common/buildcraft/robots/statements/ActionStationAcceptFluids.java index 35fedffb..81b53444 100755 --- a/common/buildcraft/robots/statements/ActionStationAcceptFluids.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptFluids.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java b/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java index 3007e9a8..516b0267 100755 --- a/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptItemsInv.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java b/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java index 1863c0ad..a22dcb2b 100755 --- a/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java +++ b/common/buildcraft/robots/statements/ActionStationAcceptItemsPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationAllowCraft.java b/common/buildcraft/robots/statements/ActionStationAllowCraft.java index 325ecb77..ad927604 100755 --- a/common/buildcraft/robots/statements/ActionStationAllowCraft.java +++ b/common/buildcraft/robots/statements/ActionStationAllowCraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationForbidRobot.java b/common/buildcraft/robots/statements/ActionStationForbidRobot.java index 42f0203b..ed664205 100755 --- a/common/buildcraft/robots/statements/ActionStationForbidRobot.java +++ b/common/buildcraft/robots/statements/ActionStationForbidRobot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationInputItems.java b/common/buildcraft/robots/statements/ActionStationInputItems.java index 353d7e7e..c1dca219 100755 --- a/common/buildcraft/robots/statements/ActionStationInputItems.java +++ b/common/buildcraft/robots/statements/ActionStationInputItems.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationProvideFluids.java b/common/buildcraft/robots/statements/ActionStationProvideFluids.java index 9e70a50a..8c368ddd 100755 --- a/common/buildcraft/robots/statements/ActionStationProvideFluids.java +++ b/common/buildcraft/robots/statements/ActionStationProvideFluids.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationProvideItems.java b/common/buildcraft/robots/statements/ActionStationProvideItems.java index 19ae58a7..5fd1bfb7 100755 --- a/common/buildcraft/robots/statements/ActionStationProvideItems.java +++ b/common/buildcraft/robots/statements/ActionStationProvideItems.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationRequestItems.java b/common/buildcraft/robots/statements/ActionStationRequestItems.java index 668a3935..056fba5d 100755 --- a/common/buildcraft/robots/statements/ActionStationRequestItems.java +++ b/common/buildcraft/robots/statements/ActionStationRequestItems.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/ActionStationRequestItemsMachine.java b/common/buildcraft/robots/statements/ActionStationRequestItemsMachine.java index 676d6908..37ef6f00 100755 --- a/common/buildcraft/robots/statements/ActionStationRequestItemsMachine.java +++ b/common/buildcraft/robots/statements/ActionStationRequestItemsMachine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/RobotsActionProvider.java b/common/buildcraft/robots/statements/RobotsActionProvider.java index 1c66aa3c..28211c98 100755 --- a/common/buildcraft/robots/statements/RobotsActionProvider.java +++ b/common/buildcraft/robots/statements/RobotsActionProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/RobotsTriggerProvider.java b/common/buildcraft/robots/statements/RobotsTriggerProvider.java index 4d5e2014..ae86e279 100755 --- a/common/buildcraft/robots/statements/RobotsTriggerProvider.java +++ b/common/buildcraft/robots/statements/RobotsTriggerProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/StateStationProvideItems.java b/common/buildcraft/robots/statements/StateStationProvideItems.java index 680c2d28..8a11c931 100755 --- a/common/buildcraft/robots/statements/StateStationProvideItems.java +++ b/common/buildcraft/robots/statements/StateStationProvideItems.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/StateStationRequestItems.java b/common/buildcraft/robots/statements/StateStationRequestItems.java index ab872bc0..d83c20cb 100755 --- a/common/buildcraft/robots/statements/StateStationRequestItems.java +++ b/common/buildcraft/robots/statements/StateStationRequestItems.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/robots/statements/TriggerRobotSleep.java b/common/buildcraft/robots/statements/TriggerRobotSleep.java index 33880ac9..9df1a008 100755 --- a/common/buildcraft/robots/statements/TriggerRobotSleep.java +++ b/common/buildcraft/robots/statements/TriggerRobotSleep.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/BlockLaser.java b/common/buildcraft/silicon/BlockLaser.java index df21b79b..14c8222d 100644 --- a/common/buildcraft/silicon/BlockLaser.java +++ b/common/buildcraft/silicon/BlockLaser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/BlockLaserTable.java b/common/buildcraft/silicon/BlockLaserTable.java index 37cd61fd..51cbb777 100644 --- a/common/buildcraft/silicon/BlockLaserTable.java +++ b/common/buildcraft/silicon/BlockLaserTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/GuiHandler.java b/common/buildcraft/silicon/GuiHandler.java index a3aef0ae..12d2c7f1 100644 --- a/common/buildcraft/silicon/GuiHandler.java +++ b/common/buildcraft/silicon/GuiHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/ItemLaserTable.java b/common/buildcraft/silicon/ItemLaserTable.java index 8beb9b5d..947a9ad8 100644 --- a/common/buildcraft/silicon/ItemLaserTable.java +++ b/common/buildcraft/silicon/ItemLaserTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/ItemRedstoneBoard.java b/common/buildcraft/silicon/ItemRedstoneBoard.java index 39eaa76c..adf329d5 100755 --- a/common/buildcraft/silicon/ItemRedstoneBoard.java +++ b/common/buildcraft/silicon/ItemRedstoneBoard.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/ItemRedstoneChipset.java b/common/buildcraft/silicon/ItemRedstoneChipset.java index 5b0b3118..1a4b557f 100644 --- a/common/buildcraft/silicon/ItemRedstoneChipset.java +++ b/common/buildcraft/silicon/ItemRedstoneChipset.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/SiliconProxy.java b/common/buildcraft/silicon/SiliconProxy.java index 64825a33..23e2b2fd 100644 --- a/common/buildcraft/silicon/SiliconProxy.java +++ b/common/buildcraft/silicon/SiliconProxy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/SiliconProxyClient.java b/common/buildcraft/silicon/SiliconProxyClient.java index 842bd7dc..598b93e9 100644 --- a/common/buildcraft/silicon/SiliconProxyClient.java +++ b/common/buildcraft/silicon/SiliconProxyClient.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/SiliconRenderBlock.java b/common/buildcraft/silicon/SiliconRenderBlock.java index dbcb71e6..fa3cb749 100644 --- a/common/buildcraft/silicon/SiliconRenderBlock.java +++ b/common/buildcraft/silicon/SiliconRenderBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/TileAdvancedCraftingTable.java b/common/buildcraft/silicon/TileAdvancedCraftingTable.java index 996c0c8a..9e215f21 100644 --- a/common/buildcraft/silicon/TileAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/TileAdvancedCraftingTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/TileAssemblyTable.java b/common/buildcraft/silicon/TileAssemblyTable.java index ea4c10d2..34610609 100644 --- a/common/buildcraft/silicon/TileAssemblyTable.java +++ b/common/buildcraft/silicon/TileAssemblyTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/TileIntegrationTable.java b/common/buildcraft/silicon/TileIntegrationTable.java index e818776c..334b8b90 100644 --- a/common/buildcraft/silicon/TileIntegrationTable.java +++ b/common/buildcraft/silicon/TileIntegrationTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/TileLaser.java b/common/buildcraft/silicon/TileLaser.java index 432904ba..fc2bfc38 100644 --- a/common/buildcraft/silicon/TileLaser.java +++ b/common/buildcraft/silicon/TileLaser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/TileLaserTableBase.java b/common/buildcraft/silicon/TileLaserTableBase.java index 2846d864..4c778c40 100644 --- a/common/buildcraft/silicon/TileLaserTableBase.java +++ b/common/buildcraft/silicon/TileLaserTableBase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/TileProgrammingTable.java b/common/buildcraft/silicon/TileProgrammingTable.java index 654eaf2c..fe577d91 100644 --- a/common/buildcraft/silicon/TileProgrammingTable.java +++ b/common/buildcraft/silicon/TileProgrammingTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java b/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java index 95024ad7..5be767b4 100755 --- a/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java +++ b/common/buildcraft/silicon/boards/ImplRedstoneBoardRegistry.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java b/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java index 79643e45..93de3ff5 100644 --- a/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/gui/ContainerAdvancedCraftingTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/ContainerAssemblyTable.java b/common/buildcraft/silicon/gui/ContainerAssemblyTable.java index 9f91d691..1f12afc9 100644 --- a/common/buildcraft/silicon/gui/ContainerAssemblyTable.java +++ b/common/buildcraft/silicon/gui/ContainerAssemblyTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/ContainerChargingTable.java b/common/buildcraft/silicon/gui/ContainerChargingTable.java index f28321b7..ed6d6f83 100644 --- a/common/buildcraft/silicon/gui/ContainerChargingTable.java +++ b/common/buildcraft/silicon/gui/ContainerChargingTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/ContainerIntegrationTable.java b/common/buildcraft/silicon/gui/ContainerIntegrationTable.java index 4e3aa03f..a088c7f6 100644 --- a/common/buildcraft/silicon/gui/ContainerIntegrationTable.java +++ b/common/buildcraft/silicon/gui/ContainerIntegrationTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/ContainerProgrammingTable.java b/common/buildcraft/silicon/gui/ContainerProgrammingTable.java index 2ea9afd6..e82f03c2 100644 --- a/common/buildcraft/silicon/gui/ContainerProgrammingTable.java +++ b/common/buildcraft/silicon/gui/ContainerProgrammingTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java b/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java index e10d050e..0a90f340 100644 --- a/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java +++ b/common/buildcraft/silicon/gui/GuiAdvancedCraftingTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 1b8a62b5..b54940f8 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/GuiChargingTable.java b/common/buildcraft/silicon/gui/GuiChargingTable.java index f720bc21..299521ee 100644 --- a/common/buildcraft/silicon/gui/GuiChargingTable.java +++ b/common/buildcraft/silicon/gui/GuiChargingTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/GuiIntegrationTable.java b/common/buildcraft/silicon/gui/GuiIntegrationTable.java index aeb1a65f..45ef859d 100644 --- a/common/buildcraft/silicon/gui/GuiIntegrationTable.java +++ b/common/buildcraft/silicon/gui/GuiIntegrationTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/GuiLaserTable.java b/common/buildcraft/silicon/gui/GuiLaserTable.java index 99cfd34f..b762afc4 100644 --- a/common/buildcraft/silicon/gui/GuiLaserTable.java +++ b/common/buildcraft/silicon/gui/GuiLaserTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/gui/GuiProgrammingTable.java b/common/buildcraft/silicon/gui/GuiProgrammingTable.java index f33070f4..22446402 100644 --- a/common/buildcraft/silicon/gui/GuiProgrammingTable.java +++ b/common/buildcraft/silicon/gui/GuiProgrammingTable.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/network/PacketHandlerSilicon.java b/common/buildcraft/silicon/network/PacketHandlerSilicon.java index 8755efd7..3257624f 100644 --- a/common/buildcraft/silicon/network/PacketHandlerSilicon.java +++ b/common/buildcraft/silicon/network/PacketHandlerSilicon.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/render/RenderLaserBlock.java b/common/buildcraft/silicon/render/RenderLaserBlock.java index 33ec0cca..f590c465 100755 --- a/common/buildcraft/silicon/render/RenderLaserBlock.java +++ b/common/buildcraft/silicon/render/RenderLaserBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/silicon/schematics/SchematicLaserTableBase.java b/common/buildcraft/silicon/schematics/SchematicLaserTableBase.java index 606961d0..f6aa8ffc 100755 --- a/common/buildcraft/silicon/schematics/SchematicLaserTableBase.java +++ b/common/buildcraft/silicon/schematics/SchematicLaserTableBase.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/ActionActiveState.java b/common/buildcraft/transport/ActionActiveState.java index caaed991..fe89b119 100755 --- a/common/buildcraft/transport/ActionActiveState.java +++ b/common/buildcraft/transport/ActionActiveState.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/BlockFilteredBuffer.java b/common/buildcraft/transport/BlockFilteredBuffer.java index 8636209b..618e3a3e 100644 --- a/common/buildcraft/transport/BlockFilteredBuffer.java +++ b/common/buildcraft/transport/BlockFilteredBuffer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java index 6cbb7bb6..15e03378 100644 --- a/common/buildcraft/transport/BlockGenericPipe.java +++ b/common/buildcraft/transport/BlockGenericPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index 3a374158..a52a71ae 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/GuiHandler.java b/common/buildcraft/transport/GuiHandler.java index da696a0e..0b8c867d 100644 --- a/common/buildcraft/transport/GuiHandler.java +++ b/common/buildcraft/transport/GuiHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/IDiamondPipe.java b/common/buildcraft/transport/IDiamondPipe.java index e149eedf..d7f5b236 100644 --- a/common/buildcraft/transport/IDiamondPipe.java +++ b/common/buildcraft/transport/IDiamondPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/IFilteredPipe.java b/common/buildcraft/transport/IFilteredPipe.java index 8df1acf9..34961a78 100644 --- a/common/buildcraft/transport/IFilteredPipe.java +++ b/common/buildcraft/transport/IFilteredPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/IPipeConnectionForced.java b/common/buildcraft/transport/IPipeConnectionForced.java index c54cf627..6bc0baf8 100644 --- a/common/buildcraft/transport/IPipeConnectionForced.java +++ b/common/buildcraft/transport/IPipeConnectionForced.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/IPipeTransportFluidsHook.java b/common/buildcraft/transport/IPipeTransportFluidsHook.java index 08953100..72f7238b 100644 --- a/common/buildcraft/transport/IPipeTransportFluidsHook.java +++ b/common/buildcraft/transport/IPipeTransportFluidsHook.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/IPipeTransportPowerHook.java b/common/buildcraft/transport/IPipeTransportPowerHook.java index eb1a28f2..0216afc5 100644 --- a/common/buildcraft/transport/IPipeTransportPowerHook.java +++ b/common/buildcraft/transport/IPipeTransportPowerHook.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/ISolidSideTile.java b/common/buildcraft/transport/ISolidSideTile.java index 7a53b50b..67a57b48 100644 --- a/common/buildcraft/transport/ISolidSideTile.java +++ b/common/buildcraft/transport/ISolidSideTile.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/ItemFacade.java b/common/buildcraft/transport/ItemFacade.java index 3eed1d8d..3b98a06c 100644 --- a/common/buildcraft/transport/ItemFacade.java +++ b/common/buildcraft/transport/ItemFacade.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index d1ab82f8..ffcd7c2c 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/ItemPipeWire.java b/common/buildcraft/transport/ItemPipeWire.java index 7a893aa2..871874fe 100644 --- a/common/buildcraft/transport/ItemPipeWire.java +++ b/common/buildcraft/transport/ItemPipeWire.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java index 59e5b20a..b4178be3 100644 --- a/common/buildcraft/transport/Pipe.java +++ b/common/buildcraft/transport/Pipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeConnectionBans.java b/common/buildcraft/transport/PipeConnectionBans.java index 53ff164b..8bb51605 100644 --- a/common/buildcraft/transport/PipeConnectionBans.java +++ b/common/buildcraft/transport/PipeConnectionBans.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeIconProvider.java b/common/buildcraft/transport/PipeIconProvider.java index f3c02cfe..6c85b65b 100644 --- a/common/buildcraft/transport/PipeIconProvider.java +++ b/common/buildcraft/transport/PipeIconProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeRenderState.java b/common/buildcraft/transport/PipeRenderState.java index a1b8a127..d6af3f24 100644 --- a/common/buildcraft/transport/PipeRenderState.java +++ b/common/buildcraft/transport/PipeRenderState.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeToolTipManager.java b/common/buildcraft/transport/PipeToolTipManager.java index 17280653..63ffd8bd 100644 --- a/common/buildcraft/transport/PipeToolTipManager.java +++ b/common/buildcraft/transport/PipeToolTipManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeTransport.java b/common/buildcraft/transport/PipeTransport.java index 944d88cc..9211c2e0 100644 --- a/common/buildcraft/transport/PipeTransport.java +++ b/common/buildcraft/transport/PipeTransport.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeTransportFluids.java b/common/buildcraft/transport/PipeTransportFluids.java index ea01557a..b090bc55 100644 --- a/common/buildcraft/transport/PipeTransportFluids.java +++ b/common/buildcraft/transport/PipeTransportFluids.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeTransportItems.java b/common/buildcraft/transport/PipeTransportItems.java index b3d97010..fb166deb 100644 --- a/common/buildcraft/transport/PipeTransportItems.java +++ b/common/buildcraft/transport/PipeTransportItems.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java index daa3ff23..510cf39b 100644 --- a/common/buildcraft/transport/PipeTransportPower.java +++ b/common/buildcraft/transport/PipeTransportPower.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeTransportStructure.java b/common/buildcraft/transport/PipeTransportStructure.java index 3509ff17..8ace8bd5 100644 --- a/common/buildcraft/transport/PipeTransportStructure.java +++ b/common/buildcraft/transport/PipeTransportStructure.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/PipeTriggerProvider.java b/common/buildcraft/transport/PipeTriggerProvider.java index c47419c5..e59e796a 100644 --- a/common/buildcraft/transport/PipeTriggerProvider.java +++ b/common/buildcraft/transport/PipeTriggerProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/TileFilteredBuffer.java b/common/buildcraft/transport/TileFilteredBuffer.java index 959bf8f7..8a783c2d 100644 --- a/common/buildcraft/transport/TileFilteredBuffer.java +++ b/common/buildcraft/transport/TileFilteredBuffer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 643f2725..f243de37 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/TransportConstants.java b/common/buildcraft/transport/TransportConstants.java index 4ece6901..4683e344 100644 --- a/common/buildcraft/transport/TransportConstants.java +++ b/common/buildcraft/transport/TransportConstants.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/TransportProxy.java b/common/buildcraft/transport/TransportProxy.java index 742975e8..005c1fcf 100644 --- a/common/buildcraft/transport/TransportProxy.java +++ b/common/buildcraft/transport/TransportProxy.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/TransportProxyClient.java b/common/buildcraft/transport/TransportProxyClient.java index 40f926ec..0b5bae7f 100644 --- a/common/buildcraft/transport/TransportProxyClient.java +++ b/common/buildcraft/transport/TransportProxyClient.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/TravelerSet.java b/common/buildcraft/transport/TravelerSet.java index df303c82..798047ed 100644 --- a/common/buildcraft/transport/TravelerSet.java +++ b/common/buildcraft/transport/TravelerSet.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/TravelingItem.java b/common/buildcraft/transport/TravelingItem.java index 7557cc09..ddd9f8a7 100644 --- a/common/buildcraft/transport/TravelingItem.java +++ b/common/buildcraft/transport/TravelingItem.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/WireIconProvider.java b/common/buildcraft/transport/WireIconProvider.java index 3f5c508e..1309ba87 100644 --- a/common/buildcraft/transport/WireIconProvider.java +++ b/common/buildcraft/transport/WireIconProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gates/ActionIterator.java b/common/buildcraft/transport/gates/ActionIterator.java index 176a40da..c0288809 100755 --- a/common/buildcraft/transport/gates/ActionIterator.java +++ b/common/buildcraft/transport/gates/ActionIterator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gates/GateDefinition.java b/common/buildcraft/transport/gates/GateDefinition.java index 27382b1b..2905540e 100644 --- a/common/buildcraft/transport/gates/GateDefinition.java +++ b/common/buildcraft/transport/gates/GateDefinition.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java index 405c4aa7..0e001b90 100644 --- a/common/buildcraft/transport/gates/GateExpansionBuildcraft.java +++ b/common/buildcraft/transport/gates/GateExpansionBuildcraft.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gates/GateExpansionPulsar.java b/common/buildcraft/transport/gates/GateExpansionPulsar.java index 44198ec7..ab95e598 100644 --- a/common/buildcraft/transport/gates/GateExpansionPulsar.java +++ b/common/buildcraft/transport/gates/GateExpansionPulsar.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java b/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java index 3dbbce43..3a6f53f8 100644 --- a/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java +++ b/common/buildcraft/transport/gates/GateExpansionRedstoneFader.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gates/GateExpansionTimer.java b/common/buildcraft/transport/gates/GateExpansionTimer.java index 7f61d908..1397c0e0 100644 --- a/common/buildcraft/transport/gates/GateExpansionTimer.java +++ b/common/buildcraft/transport/gates/GateExpansionTimer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gates/GateFactory.java b/common/buildcraft/transport/gates/GateFactory.java index 45aa1987..3687c617 100644 --- a/common/buildcraft/transport/gates/GateFactory.java +++ b/common/buildcraft/transport/gates/GateFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gates/ItemGate.java b/common/buildcraft/transport/gates/ItemGate.java index efa387d7..3b5b70a0 100755 --- a/common/buildcraft/transport/gates/ItemGate.java +++ b/common/buildcraft/transport/gates/ItemGate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gates/StatementSlot.java b/common/buildcraft/transport/gates/StatementSlot.java index e756e3c4..385968a0 100755 --- a/common/buildcraft/transport/gates/StatementSlot.java +++ b/common/buildcraft/transport/gates/StatementSlot.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/ContainerDiamondPipe.java b/common/buildcraft/transport/gui/ContainerDiamondPipe.java index 2c7f9462..a8f537fc 100644 --- a/common/buildcraft/transport/gui/ContainerDiamondPipe.java +++ b/common/buildcraft/transport/gui/ContainerDiamondPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java b/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java index 7cdbef08..ee94935a 100644 --- a/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/ContainerEmeraldPipe.java b/common/buildcraft/transport/gui/ContainerEmeraldPipe.java index bfc9a030..92eb68b8 100644 --- a/common/buildcraft/transport/gui/ContainerEmeraldPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmeraldPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/ContainerEmzuliPipe.java b/common/buildcraft/transport/gui/ContainerEmzuliPipe.java index abb8c81c..4e5f84b1 100644 --- a/common/buildcraft/transport/gui/ContainerEmzuliPipe.java +++ b/common/buildcraft/transport/gui/ContainerEmzuliPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/ContainerFilteredBuffer.java b/common/buildcraft/transport/gui/ContainerFilteredBuffer.java index 2f4fb67d..c7f47909 100644 --- a/common/buildcraft/transport/gui/ContainerFilteredBuffer.java +++ b/common/buildcraft/transport/gui/ContainerFilteredBuffer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/ContainerGateInterface.java b/common/buildcraft/transport/gui/ContainerGateInterface.java index c97af439..a68c9e13 100644 --- a/common/buildcraft/transport/gui/ContainerGateInterface.java +++ b/common/buildcraft/transport/gui/ContainerGateInterface.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/GuiDiamondPipe.java b/common/buildcraft/transport/gui/GuiDiamondPipe.java index fd98a186..b092ced3 100644 --- a/common/buildcraft/transport/gui/GuiDiamondPipe.java +++ b/common/buildcraft/transport/gui/GuiDiamondPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java index 8c7d6ad8..2c38dc38 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldFluidPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/GuiEmeraldPipe.java b/common/buildcraft/transport/gui/GuiEmeraldPipe.java index 62be4a18..9230232f 100644 --- a/common/buildcraft/transport/gui/GuiEmeraldPipe.java +++ b/common/buildcraft/transport/gui/GuiEmeraldPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/GuiEmzuliPipe.java b/common/buildcraft/transport/gui/GuiEmzuliPipe.java index feaa1ab2..05403bd5 100644 --- a/common/buildcraft/transport/gui/GuiEmzuliPipe.java +++ b/common/buildcraft/transport/gui/GuiEmzuliPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/GuiFilteredBuffer.java b/common/buildcraft/transport/gui/GuiFilteredBuffer.java index 27349876..819c1834 100644 --- a/common/buildcraft/transport/gui/GuiFilteredBuffer.java +++ b/common/buildcraft/transport/gui/GuiFilteredBuffer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/gui/GuiGateInterface.java b/common/buildcraft/transport/gui/GuiGateInterface.java index f7498188..5a21ce91 100644 --- a/common/buildcraft/transport/gui/GuiGateInterface.java +++ b/common/buildcraft/transport/gui/GuiGateInterface.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/network/PacketFluidUpdate.java b/common/buildcraft/transport/network/PacketFluidUpdate.java index fdae58a5..44bd81f7 100644 --- a/common/buildcraft/transport/network/PacketFluidUpdate.java +++ b/common/buildcraft/transport/network/PacketFluidUpdate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/network/PacketHandlerTransport.java b/common/buildcraft/transport/network/PacketHandlerTransport.java index a855befe..6d461509 100644 --- a/common/buildcraft/transport/network/PacketHandlerTransport.java +++ b/common/buildcraft/transport/network/PacketHandlerTransport.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/network/PacketPipeTransportItemStack.java b/common/buildcraft/transport/network/PacketPipeTransportItemStack.java index d772eedc..b36124b0 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportItemStack.java +++ b/common/buildcraft/transport/network/PacketPipeTransportItemStack.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java b/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java index 8d0850cb..d58d1139 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java +++ b/common/buildcraft/transport/network/PacketPipeTransportItemStackRequest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/network/PacketPipeTransportTraveler.java b/common/buildcraft/transport/network/PacketPipeTransportTraveler.java index 9a7dc4be..9b31570e 100644 --- a/common/buildcraft/transport/network/PacketPipeTransportTraveler.java +++ b/common/buildcraft/transport/network/PacketPipeTransportTraveler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/network/PacketPowerUpdate.java b/common/buildcraft/transport/network/PacketPowerUpdate.java index f9b08e36..1bf21a43 100644 --- a/common/buildcraft/transport/network/PacketPowerUpdate.java +++ b/common/buildcraft/transport/network/PacketPowerUpdate.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java b/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java index 98af1f40..dc0f4b5a 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeFluidsCobblestone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java index 684fb6e6..4169d1d5 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsEmerald.java b/common/buildcraft/transport/pipes/PipeFluidsEmerald.java index 0448acc0..2106ecea 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeFluidsEmerald.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsGold.java b/common/buildcraft/transport/pipes/PipeFluidsGold.java index 991ecaf9..3ba64d08 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsGold.java +++ b/common/buildcraft/transport/pipes/PipeFluidsGold.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsIron.java b/common/buildcraft/transport/pipes/PipeFluidsIron.java index 41f7806f..3392e287 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsIron.java +++ b/common/buildcraft/transport/pipes/PipeFluidsIron.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsQuartz.java b/common/buildcraft/transport/pipes/PipeFluidsQuartz.java index c31c25d7..a029c5b2 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsQuartz.java +++ b/common/buildcraft/transport/pipes/PipeFluidsQuartz.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsSandstone.java b/common/buildcraft/transport/pipes/PipeFluidsSandstone.java index 422145d2..71f220c2 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeFluidsSandstone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsStone.java b/common/buildcraft/transport/pipes/PipeFluidsStone.java index 2ec020e3..7e126743 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsStone.java +++ b/common/buildcraft/transport/pipes/PipeFluidsStone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsVoid.java b/common/buildcraft/transport/pipes/PipeFluidsVoid.java index ddea6dac..527880d7 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsVoid.java +++ b/common/buildcraft/transport/pipes/PipeFluidsVoid.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeFluidsWood.java b/common/buildcraft/transport/pipes/PipeFluidsWood.java index b9ecca8e..20e62270 100644 --- a/common/buildcraft/transport/pipes/PipeFluidsWood.java +++ b/common/buildcraft/transport/pipes/PipeFluidsWood.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsClay.java b/common/buildcraft/transport/pipes/PipeItemsClay.java index bf6a18fb..55764658 100644 --- a/common/buildcraft/transport/pipes/PipeItemsClay.java +++ b/common/buildcraft/transport/pipes/PipeItemsClay.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java index 9da3bebd..91dc999c 100644 --- a/common/buildcraft/transport/pipes/PipeItemsCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeItemsCobblestone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java index 2d8af493..6141bc1f 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDaizuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsDaizuli.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java index 9b1d1fc5..04bf8e7b 100644 --- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java +++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsEmerald.java b/common/buildcraft/transport/pipes/PipeItemsEmerald.java index f344495d..e307ec9f 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmerald.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmerald.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java index aef5459f..777f869e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsEmzuli.java +++ b/common/buildcraft/transport/pipes/PipeItemsEmzuli.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsGold.java b/common/buildcraft/transport/pipes/PipeItemsGold.java index cc1aa50c..bb58107e 100644 --- a/common/buildcraft/transport/pipes/PipeItemsGold.java +++ b/common/buildcraft/transport/pipes/PipeItemsGold.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsIron.java b/common/buildcraft/transport/pipes/PipeItemsIron.java index 735dc830..159916b5 100644 --- a/common/buildcraft/transport/pipes/PipeItemsIron.java +++ b/common/buildcraft/transport/pipes/PipeItemsIron.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsLapis.java b/common/buildcraft/transport/pipes/PipeItemsLapis.java index cbcbd00d..6519048b 100644 --- a/common/buildcraft/transport/pipes/PipeItemsLapis.java +++ b/common/buildcraft/transport/pipes/PipeItemsLapis.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsObsidian.java b/common/buildcraft/transport/pipes/PipeItemsObsidian.java index 15409b6d..ecbcec20 100644 --- a/common/buildcraft/transport/pipes/PipeItemsObsidian.java +++ b/common/buildcraft/transport/pipes/PipeItemsObsidian.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsQuartz.java b/common/buildcraft/transport/pipes/PipeItemsQuartz.java index 038f2e17..b147f2b1 100644 --- a/common/buildcraft/transport/pipes/PipeItemsQuartz.java +++ b/common/buildcraft/transport/pipes/PipeItemsQuartz.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsSandstone.java b/common/buildcraft/transport/pipes/PipeItemsSandstone.java index 1036969c..c10082d0 100644 --- a/common/buildcraft/transport/pipes/PipeItemsSandstone.java +++ b/common/buildcraft/transport/pipes/PipeItemsSandstone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsStone.java b/common/buildcraft/transport/pipes/PipeItemsStone.java index db2d6ced..e8ea75e7 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStone.java +++ b/common/buildcraft/transport/pipes/PipeItemsStone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java index 217b990e..279b0c0c 100644 --- a/common/buildcraft/transport/pipes/PipeItemsStripes.java +++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsVoid.java b/common/buildcraft/transport/pipes/PipeItemsVoid.java index a97dee20..dceb13ca 100644 --- a/common/buildcraft/transport/pipes/PipeItemsVoid.java +++ b/common/buildcraft/transport/pipes/PipeItemsVoid.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeItemsWood.java b/common/buildcraft/transport/pipes/PipeItemsWood.java index 29ce5f04..1beab622 100644 --- a/common/buildcraft/transport/pipes/PipeItemsWood.java +++ b/common/buildcraft/transport/pipes/PipeItemsWood.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeLogicIron.java b/common/buildcraft/transport/pipes/PipeLogicIron.java index 6d817983..00c156c8 100644 --- a/common/buildcraft/transport/pipes/PipeLogicIron.java +++ b/common/buildcraft/transport/pipes/PipeLogicIron.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeLogicWood.java b/common/buildcraft/transport/pipes/PipeLogicWood.java index 5f354389..7c46ee6f 100644 --- a/common/buildcraft/transport/pipes/PipeLogicWood.java +++ b/common/buildcraft/transport/pipes/PipeLogicWood.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipePowerCobblestone.java b/common/buildcraft/transport/pipes/PipePowerCobblestone.java index 2e6f1e2f..a494683c 100644 --- a/common/buildcraft/transport/pipes/PipePowerCobblestone.java +++ b/common/buildcraft/transport/pipes/PipePowerCobblestone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipePowerDiamond.java b/common/buildcraft/transport/pipes/PipePowerDiamond.java index cc662a72..5b80133a 100644 --- a/common/buildcraft/transport/pipes/PipePowerDiamond.java +++ b/common/buildcraft/transport/pipes/PipePowerDiamond.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipePowerGold.java b/common/buildcraft/transport/pipes/PipePowerGold.java index c1046d79..4547c96e 100644 --- a/common/buildcraft/transport/pipes/PipePowerGold.java +++ b/common/buildcraft/transport/pipes/PipePowerGold.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipePowerIron.java b/common/buildcraft/transport/pipes/PipePowerIron.java index 33ffbbc1..294854e4 100644 --- a/common/buildcraft/transport/pipes/PipePowerIron.java +++ b/common/buildcraft/transport/pipes/PipePowerIron.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipePowerQuartz.java b/common/buildcraft/transport/pipes/PipePowerQuartz.java index ff98b7ad..70005dca 100644 --- a/common/buildcraft/transport/pipes/PipePowerQuartz.java +++ b/common/buildcraft/transport/pipes/PipePowerQuartz.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipePowerSandstone.java b/common/buildcraft/transport/pipes/PipePowerSandstone.java index 3b7d8563..b0fc52ff 100644 --- a/common/buildcraft/transport/pipes/PipePowerSandstone.java +++ b/common/buildcraft/transport/pipes/PipePowerSandstone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipePowerStone.java b/common/buildcraft/transport/pipes/PipePowerStone.java index 98a69685..13ed5452 100644 --- a/common/buildcraft/transport/pipes/PipePowerStone.java +++ b/common/buildcraft/transport/pipes/PipePowerStone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 46da8b48..46ccecca 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java index c661494d..aa49087b 100644 --- a/common/buildcraft/transport/pipes/PipeStructureCobblestone.java +++ b/common/buildcraft/transport/pipes/PipeStructureCobblestone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/events/PipeEvent.java b/common/buildcraft/transport/pipes/events/PipeEvent.java index e5d74a5a..c825c05e 100644 --- a/common/buildcraft/transport/pipes/events/PipeEvent.java +++ b/common/buildcraft/transport/pipes/events/PipeEvent.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pipes/events/PipeEventItem.java b/common/buildcraft/transport/pipes/events/PipeEventItem.java index 5e7282a6..d5d89782 100644 --- a/common/buildcraft/transport/pipes/events/PipeEventItem.java +++ b/common/buildcraft/transport/pipes/events/PipeEventItem.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pluggable/ItemLens.java b/common/buildcraft/transport/pluggable/ItemLens.java index ce561d2f..2e679e32 100755 --- a/common/buildcraft/transport/pluggable/ItemLens.java +++ b/common/buildcraft/transport/pluggable/ItemLens.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pluggable/ItemPlug.java b/common/buildcraft/transport/pluggable/ItemPlug.java index 273fb873..3928cf53 100755 --- a/common/buildcraft/transport/pluggable/ItemPlug.java +++ b/common/buildcraft/transport/pluggable/ItemPlug.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/pluggable/ItemPowerAdapter.java b/common/buildcraft/transport/pluggable/ItemPowerAdapter.java index d1b5971f..acc8b640 100755 --- a/common/buildcraft/transport/pluggable/ItemPowerAdapter.java +++ b/common/buildcraft/transport/pluggable/ItemPowerAdapter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java b/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java index 3fe5d4d3..4c513f7e 100644 --- a/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java +++ b/common/buildcraft/transport/recipes/AdvancedFacadeRecipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/recipes/GateExpansionRecipe.java b/common/buildcraft/transport/recipes/GateExpansionRecipe.java index 35c1b302..9694f1e7 100644 --- a/common/buildcraft/transport/recipes/GateExpansionRecipe.java +++ b/common/buildcraft/transport/recipes/GateExpansionRecipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java b/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java index 81e2c081..759a3126 100644 --- a/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java +++ b/common/buildcraft/transport/recipes/GateLogicSwapRecipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/recipes/IntegrationTableRecipe.java b/common/buildcraft/transport/recipes/IntegrationTableRecipe.java index 0c16ee4a..3171e6dc 100755 --- a/common/buildcraft/transport/recipes/IntegrationTableRecipe.java +++ b/common/buildcraft/transport/recipes/IntegrationTableRecipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/FacadeItemRenderer.java b/common/buildcraft/transport/render/FacadeItemRenderer.java index a60abf1a..f86853a9 100644 --- a/common/buildcraft/transport/render/FacadeItemRenderer.java +++ b/common/buildcraft/transport/render/FacadeItemRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/FacadeRenderHelper.java b/common/buildcraft/transport/render/FacadeRenderHelper.java index bacfd249..e98ebd2e 100644 --- a/common/buildcraft/transport/render/FacadeRenderHelper.java +++ b/common/buildcraft/transport/render/FacadeRenderHelper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/FakeBlock.java b/common/buildcraft/transport/render/FakeBlock.java index 99568ba9..77c14276 100644 --- a/common/buildcraft/transport/render/FakeBlock.java +++ b/common/buildcraft/transport/render/FakeBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/GateItemRenderer.java b/common/buildcraft/transport/render/GateItemRenderer.java index 2125120d..d83287f0 100644 --- a/common/buildcraft/transport/render/GateItemRenderer.java +++ b/common/buildcraft/transport/render/GateItemRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/PipeItemRenderer.java b/common/buildcraft/transport/render/PipeItemRenderer.java index afaa6ba3..76744f16 100644 --- a/common/buildcraft/transport/render/PipeItemRenderer.java +++ b/common/buildcraft/transport/render/PipeItemRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/PipeRendererTESR.java b/common/buildcraft/transport/render/PipeRendererTESR.java index e87ff32d..06ec67b3 100644 --- a/common/buildcraft/transport/render/PipeRendererTESR.java +++ b/common/buildcraft/transport/render/PipeRendererTESR.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/PipeRendererWorld.java b/common/buildcraft/transport/render/PipeRendererWorld.java index dbcb1c6d..23b4c211 100644 --- a/common/buildcraft/transport/render/PipeRendererWorld.java +++ b/common/buildcraft/transport/render/PipeRendererWorld.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/PlugItemRenderer.java b/common/buildcraft/transport/render/PlugItemRenderer.java index f47c03ad..75b67ff2 100644 --- a/common/buildcraft/transport/render/PlugItemRenderer.java +++ b/common/buildcraft/transport/render/PlugItemRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/RobotStationItemRenderer.java b/common/buildcraft/transport/render/RobotStationItemRenderer.java index 50584d0c..6afa8034 100755 --- a/common/buildcraft/transport/render/RobotStationItemRenderer.java +++ b/common/buildcraft/transport/render/RobotStationItemRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/TextureStateManager.java b/common/buildcraft/transport/render/TextureStateManager.java index 6e3ca378..a7e1f51f 100644 --- a/common/buildcraft/transport/render/TextureStateManager.java +++ b/common/buildcraft/transport/render/TextureStateManager.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/render/TileEntityPickupFX.java b/common/buildcraft/transport/render/TileEntityPickupFX.java index b8e9360c..c022588a 100644 --- a/common/buildcraft/transport/render/TileEntityPickupFX.java +++ b/common/buildcraft/transport/render/TileEntityPickupFX.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/schematics/BptItemPipeFilters.java b/common/buildcraft/transport/schematics/BptItemPipeFilters.java index 2011804a..f79fad0e 100644 --- a/common/buildcraft/transport/schematics/BptItemPipeFilters.java +++ b/common/buildcraft/transport/schematics/BptItemPipeFilters.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/schematics/BptPipeExtension.java b/common/buildcraft/transport/schematics/BptPipeExtension.java index bc095fd2..09addd7f 100755 --- a/common/buildcraft/transport/schematics/BptPipeExtension.java +++ b/common/buildcraft/transport/schematics/BptPipeExtension.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/schematics/BptPipeIron.java b/common/buildcraft/transport/schematics/BptPipeIron.java index 12aa5eb7..a32a0aac 100644 --- a/common/buildcraft/transport/schematics/BptPipeIron.java +++ b/common/buildcraft/transport/schematics/BptPipeIron.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/schematics/BptPipeWooden.java b/common/buildcraft/transport/schematics/BptPipeWooden.java index b6649b4b..242a62a0 100644 --- a/common/buildcraft/transport/schematics/BptPipeWooden.java +++ b/common/buildcraft/transport/schematics/BptPipeWooden.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/schematics/SchematicPipe.java b/common/buildcraft/transport/schematics/SchematicPipe.java index b14663da..40ce1722 100644 --- a/common/buildcraft/transport/schematics/SchematicPipe.java +++ b/common/buildcraft/transport/schematics/SchematicPipe.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionEnergyPulsar.java b/common/buildcraft/transport/statements/ActionEnergyPulsar.java index 69ab472b..91fda04d 100644 --- a/common/buildcraft/transport/statements/ActionEnergyPulsar.java +++ b/common/buildcraft/transport/statements/ActionEnergyPulsar.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionExtractionPreset.java b/common/buildcraft/transport/statements/ActionExtractionPreset.java index 74d5b52b..fb6d6fcc 100644 --- a/common/buildcraft/transport/statements/ActionExtractionPreset.java +++ b/common/buildcraft/transport/statements/ActionExtractionPreset.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionParameterSignal.java b/common/buildcraft/transport/statements/ActionParameterSignal.java index 43eb2741..62b93916 100644 --- a/common/buildcraft/transport/statements/ActionParameterSignal.java +++ b/common/buildcraft/transport/statements/ActionParameterSignal.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionPipeColor.java b/common/buildcraft/transport/statements/ActionPipeColor.java index 53b2579a..dd0c6728 100644 --- a/common/buildcraft/transport/statements/ActionPipeColor.java +++ b/common/buildcraft/transport/statements/ActionPipeColor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionPipeDirection.java b/common/buildcraft/transport/statements/ActionPipeDirection.java index eab58c69..c1c97c0d 100644 --- a/common/buildcraft/transport/statements/ActionPipeDirection.java +++ b/common/buildcraft/transport/statements/ActionPipeDirection.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionPowerLimiter.java b/common/buildcraft/transport/statements/ActionPowerLimiter.java index a90804fe..dc766212 100644 --- a/common/buildcraft/transport/statements/ActionPowerLimiter.java +++ b/common/buildcraft/transport/statements/ActionPowerLimiter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java index cefd3e3f..61a96fad 100644 --- a/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java +++ b/common/buildcraft/transport/statements/ActionRedstoneFaderOutput.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionSignalOutput.java b/common/buildcraft/transport/statements/ActionSignalOutput.java index b6edb642..7dfbf6b5 100644 --- a/common/buildcraft/transport/statements/ActionSignalOutput.java +++ b/common/buildcraft/transport/statements/ActionSignalOutput.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java index 0c88eb14..d5d9762d 100644 --- a/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java +++ b/common/buildcraft/transport/statements/ActionSingleEnergyPulse.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/ActionValve.java b/common/buildcraft/transport/statements/ActionValve.java index e3279b18..12d48cfd 100644 --- a/common/buildcraft/transport/statements/ActionValve.java +++ b/common/buildcraft/transport/statements/ActionValve.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/TriggerClockTimer.java b/common/buildcraft/transport/statements/TriggerClockTimer.java index 57f94697..8aaafbe5 100644 --- a/common/buildcraft/transport/statements/TriggerClockTimer.java +++ b/common/buildcraft/transport/statements/TriggerClockTimer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/TriggerParameterSignal.java b/common/buildcraft/transport/statements/TriggerParameterSignal.java index 55c574d3..ed202e6c 100644 --- a/common/buildcraft/transport/statements/TriggerParameterSignal.java +++ b/common/buildcraft/transport/statements/TriggerParameterSignal.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/TriggerPipeContents.java b/common/buildcraft/transport/statements/TriggerPipeContents.java index 3281579a..389982ff 100644 --- a/common/buildcraft/transport/statements/TriggerPipeContents.java +++ b/common/buildcraft/transport/statements/TriggerPipeContents.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/TriggerPipeSignal.java b/common/buildcraft/transport/statements/TriggerPipeSignal.java index 7adada46..92eb7a06 100644 --- a/common/buildcraft/transport/statements/TriggerPipeSignal.java +++ b/common/buildcraft/transport/statements/TriggerPipeSignal.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java index 0ded3ea7..dd042578 100644 --- a/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java +++ b/common/buildcraft/transport/statements/TriggerRedstoneFaderInput.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/stripes/StripesHandlerDefault.java b/common/buildcraft/transport/stripes/StripesHandlerDefault.java index d2e31fec..f8860e52 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerDefault.java +++ b/common/buildcraft/transport/stripes/StripesHandlerDefault.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java b/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java index 414a6761..c0e6b689 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java +++ b/common/buildcraft/transport/stripes/StripesHandlerEntityInteract.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/stripes/StripesHandlerPipes.java b/common/buildcraft/transport/stripes/StripesHandlerPipes.java index b2c08fe1..7b3e8267 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPipes.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPipes.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java b/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java index d04738a3..2ae8def7 100644 --- a/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java +++ b/common/buildcraft/transport/stripes/StripesHandlerPlaceBlock.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * The BuildCraft API is distributed under the terms of the MIT License. diff --git a/common/buildcraft/transport/utils/BitSetCodec.java b/common/buildcraft/transport/utils/BitSetCodec.java index 3e246289..5784b32d 100644 --- a/common/buildcraft/transport/utils/BitSetCodec.java +++ b/common/buildcraft/transport/utils/BitSetCodec.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/utils/ConnectionMatrix.java b/common/buildcraft/transport/utils/ConnectionMatrix.java index a8ce55df..a17770bd 100644 --- a/common/buildcraft/transport/utils/ConnectionMatrix.java +++ b/common/buildcraft/transport/utils/ConnectionMatrix.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/utils/TextureMatrix.java b/common/buildcraft/transport/utils/TextureMatrix.java index 66823e8f..c298d136 100644 --- a/common/buildcraft/transport/utils/TextureMatrix.java +++ b/common/buildcraft/transport/utils/TextureMatrix.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/utils/TransportUtils.java b/common/buildcraft/transport/utils/TransportUtils.java index 198a90bc..345d61ab 100644 --- a/common/buildcraft/transport/utils/TransportUtils.java +++ b/common/buildcraft/transport/utils/TransportUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public diff --git a/common/buildcraft/transport/utils/WireMatrix.java b/common/buildcraft/transport/utils/WireMatrix.java index 7b84d8f3..5006379e 100644 --- a/common/buildcraft/transport/utils/WireMatrix.java +++ b/common/buildcraft/transport/utils/WireMatrix.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * * BuildCraft is distributed under the terms of the Minecraft Mod Public From 1d462b17941b2cf87ebf1808c14f7e3daa11afb2 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 26 Feb 2015 17:08:29 +0100 Subject: [PATCH 63/67] entities can now have building permissions in schematics --- .../api/blueprints/SchematicEntity.java | 13 +++--- .../api/blueprints/package-info.java | 2 +- api/buildcraft/api/core/BlockIndex.java | 2 +- .../buildcraft/core/blueprints/Blueprint.java | 44 +++++++++++++------ 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/api/buildcraft/api/blueprints/SchematicEntity.java b/api/buildcraft/api/blueprints/SchematicEntity.java index 8dc12f85..b1749fc3 100755 --- a/api/buildcraft/api/blueprints/SchematicEntity.java +++ b/api/buildcraft/api/blueprints/SchematicEntity.java @@ -26,7 +26,6 @@ import net.minecraftforge.common.util.Constants; import buildcraft.api.core.Position; public class SchematicEntity extends Schematic { - public Class entity; /** @@ -43,6 +42,7 @@ public class SchematicEntity extends Schematic { * Schematic. */ public ItemStack[] storedRequirements = new ItemStack[0]; + public BuildingPermission defaultPermission = BuildingPermission.ALL; @Override public void getRequirementsForPlacement(IBuilderContext context, LinkedList requirements) { @@ -154,13 +154,11 @@ public class SchematicEntity extends Schematic { rqs.add(ItemStack.loadItemStackFromNBT(sub)); } else { - // TODO: requirement can't be retreived, this blueprint is - // only useable in creative + defaultPermission = BuildingPermission.CREATIVE_ONLY; } } catch (Throwable t) { t.printStackTrace(); - // TODO: requirement can't be retreived, this blueprint is - // only useable in creative + defaultPermission = BuildingPermission.CREATIVE_ONLY; } } @@ -215,4 +213,9 @@ public class SchematicEntity extends Schematic { public int buildTime() { return 5; } + + @Override + public BuildingPermission getBuildingPermission() { + return defaultPermission; + } } diff --git a/api/buildcraft/api/blueprints/package-info.java b/api/buildcraft/api/blueprints/package-info.java index a041a45f..a9b38269 100644 --- a/api/buildcraft/api/blueprints/package-info.java +++ b/api/buildcraft/api/blueprints/package-info.java @@ -6,7 +6,7 @@ * Please check the contents of the license, which should be located * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blueprints") +@API(apiVersion = "1.2", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blueprints") package buildcraft.api.blueprints; import cpw.mods.fml.common.API; diff --git a/api/buildcraft/api/core/BlockIndex.java b/api/buildcraft/api/core/BlockIndex.java index cf378ea8..862f778c 100644 --- a/api/buildcraft/api/core/BlockIndex.java +++ b/api/buildcraft/api/core/BlockIndex.java @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; /** - * This class is a comparable container for block positions. TODO: should this be merged with position? + * This class is a comparable container for integer block positions. */ public class BlockIndex implements Comparable { diff --git a/common/buildcraft/core/blueprints/Blueprint.java b/common/buildcraft/core/blueprints/Blueprint.java index b4be5267..513ae9e6 100644 --- a/common/buildcraft/core/blueprints/Blueprint.java +++ b/common/buildcraft/core/blueprints/Blueprint.java @@ -113,25 +113,26 @@ public class Blueprint extends BlueprintBase { } switch (slot.getBuildingPermission()) { - case ALL: - break; - case CREATIVE_ONLY: - if (bptContext.readConfiguration.allowCreative) { - if (buildingPermission == BuildingPermission.ALL) { - buildingPermission = BuildingPermission.CREATIVE_ONLY; + case ALL: + break; + case CREATIVE_ONLY: + if (bptContext.readConfiguration.allowCreative) { + if (buildingPermission == BuildingPermission.ALL) { + buildingPermission = BuildingPermission.CREATIVE_ONLY; + } + } else { + contents[posX][posY][posZ] = null; } - } else { - contents[posX][posY][posZ] = null; - } - break; - case NONE: - buildingPermission = BuildingPermission.NONE; - break; + break; + case NONE: + buildingPermission = BuildingPermission.NONE; + break; } } @Override public void readEntitiesFromWorld(IBuilderContext context, TileEntity anchorTile) { + BptContext bptContext = (BptContext) context; Translation transform = new Translation(); transform.x = -context.surroundingBox().pMin().x; @@ -146,7 +147,22 @@ public class Blueprint extends BlueprintBase { if (s != null) { s.readFromWorld(context, e); - entities.add(s); + switch (s.getBuildingPermission()) { + case ALL: + entities.add(s); + break; + case CREATIVE_ONLY: + if (bptContext.readConfiguration.allowCreative) { + if (buildingPermission == BuildingPermission.ALL) { + buildingPermission = BuildingPermission.CREATIVE_ONLY; + } + entities.add(s); + } + break; + case NONE: + buildingPermission = BuildingPermission.NONE; + break; + } } } } From 78f8a059b4450229f230636f6b085da3d999704e Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 26 Feb 2015 17:16:52 +0100 Subject: [PATCH 64/67] clean up TODOs, restore pipe item sounds --- common/buildcraft/core/EntityBlock.java | 2 +- common/buildcraft/core/TileBuildCraft.java | 2 -- .../buildcraft/core/blueprints/BlueprintBase.java | 1 - .../buildcraft/core/blueprints/BptDataStream.java | 11 ++++++----- common/buildcraft/core/gui/FluidSlot.java | 1 - .../buildcraft/core/inventory/FluidHandlerCopy.java | 1 - common/buildcraft/core/network/PacketNBT.java | 2 -- common/buildcraft/core/render/RenderVoid.java | 1 - common/buildcraft/robots/EntityRobot.java | 5 ----- .../robots/statements/ActionRobotWakeUp.java | 2 +- common/buildcraft/transport/Gate.java | 2 +- common/buildcraft/transport/ItemPipe.java | 9 ++++----- .../buildcraft/transport/pipes/PipePowerWood.java | 13 ------------- .../transport/render/PipeRendererWorld.java | 2 +- .../transport/statements/ActionEnergyPulsar.java | 1 - .../transport/statements/ActionPipeDirection.java | 1 - 16 files changed, 14 insertions(+), 42 deletions(-) diff --git a/common/buildcraft/core/EntityBlock.java b/common/buildcraft/core/EntityBlock.java index 29acc352..47e948c0 100644 --- a/common/buildcraft/core/EntityBlock.java +++ b/common/buildcraft/core/EntityBlock.java @@ -73,7 +73,7 @@ public class EntityBlock extends Entity { @Override protected void entityInit() { - // TODO Auto-generated method stub + } @Override diff --git a/common/buildcraft/core/TileBuildCraft.java b/common/buildcraft/core/TileBuildCraft.java index 93852fea..0a7ff38a 100644 --- a/common/buildcraft/core/TileBuildCraft.java +++ b/common/buildcraft/core/TileBuildCraft.java @@ -32,8 +32,6 @@ import buildcraft.core.network.ISynchronizedTile; import buildcraft.core.network.PacketTileUpdate; import buildcraft.core.utils.Utils; -// TODO: Move back to IEnergyReceiver when EIO updates - /** * For future maintainers: This class intentionally does not implement * just every interface out there. For some of them (such as IControllable), diff --git a/common/buildcraft/core/blueprints/BlueprintBase.java b/common/buildcraft/core/blueprints/BlueprintBase.java index 1e25259a..0769ed10 100644 --- a/common/buildcraft/core/blueprints/BlueprintBase.java +++ b/common/buildcraft/core/blueprints/BlueprintBase.java @@ -279,7 +279,6 @@ public abstract class BlueprintBase { try { BlueprintBase.this.setData(CompressedStreamTools.compress(nbt)); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/common/buildcraft/core/blueprints/BptDataStream.java b/common/buildcraft/core/blueprints/BptDataStream.java index f143f0e1..dbb0ccf2 100644 --- a/common/buildcraft/core/blueprints/BptDataStream.java +++ b/common/buildcraft/core/blueprints/BptDataStream.java @@ -41,8 +41,13 @@ public class BptDataStream implements DataInput, DataOutput { @Override public void readFully(byte[] b, int off, int len) throws IOException { - // TODO Auto-generated method stub + char[] c = new char[len]; + reader.read(c); + + for (int i = 0; i < len; ++i) { + b[off + i] = (byte) c[i]; + } } @Override @@ -146,7 +151,6 @@ public class BptDataStream implements DataInput, DataOutput { @Override public String readLine() throws IOException { - // TODO Auto-generated method stub return null; } @@ -205,19 +209,16 @@ public class BptDataStream implements DataInput, DataOutput { @Override public void write(int b) throws IOException { - // TODO Auto-generated method stub } @Override public void write(byte[] b) throws IOException { - // TODO Auto-generated method stub } @Override public void write(byte[] b, int off, int len) throws IOException { - // TODO Auto-generated method stub } diff --git a/common/buildcraft/core/gui/FluidSlot.java b/common/buildcraft/core/gui/FluidSlot.java index a2c406ef..2b568cc6 100755 --- a/common/buildcraft/core/gui/FluidSlot.java +++ b/common/buildcraft/core/gui/FluidSlot.java @@ -19,7 +19,6 @@ import buildcraft.core.render.RenderUtils; /** * For the refinery, a kind of phantom slot for fluid. */ -//TODO Get this class working well (Now it's just here to let the refinery compil) public class FluidSlot extends AdvancedSlot { public Fluid fluid; diff --git a/common/buildcraft/core/inventory/FluidHandlerCopy.java b/common/buildcraft/core/inventory/FluidHandlerCopy.java index 31da0e8e..224d9652 100755 --- a/common/buildcraft/core/inventory/FluidHandlerCopy.java +++ b/common/buildcraft/core/inventory/FluidHandlerCopy.java @@ -44,7 +44,6 @@ public class FluidHandlerCopy implements IFluidHandler { @Override public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - // TODO Auto-generated method stub return null; } diff --git a/common/buildcraft/core/network/PacketNBT.java b/common/buildcraft/core/network/PacketNBT.java index 7f361df7..99b2f884 100644 --- a/common/buildcraft/core/network/PacketNBT.java +++ b/common/buildcraft/core/network/PacketNBT.java @@ -42,7 +42,6 @@ public class PacketNBT extends PacketCoordinates { data.writeShort(compressed.length); data.writeBytes(compressed); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } @@ -58,7 +57,6 @@ public class PacketNBT extends PacketCoordinates { try { this.nbttagcompound = CompressedStreamTools.func_152457_a(compressed, NBTSizeTracker.field_152451_a); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } diff --git a/common/buildcraft/core/render/RenderVoid.java b/common/buildcraft/core/render/RenderVoid.java index 7f53c1f0..fae1f884 100644 --- a/common/buildcraft/core/render/RenderVoid.java +++ b/common/buildcraft/core/render/RenderVoid.java @@ -16,7 +16,6 @@ public class RenderVoid extends Render { @Override public void doRender(Entity entity, double d, double d1, double d2, float f, float f1) { - // TODO Auto-generated method stub } diff --git a/common/buildcraft/robots/EntityRobot.java b/common/buildcraft/robots/EntityRobot.java index 6c9ba8cd..fa00fbe6 100644 --- a/common/buildcraft/robots/EntityRobot.java +++ b/common/buildcraft/robots/EntityRobot.java @@ -948,11 +948,6 @@ public class EntityRobot extends EntityRobotBase implements @Override public void setDead() { if (!worldObj.isRemote && !isDead) { - // FIXME: placing a robot gives it full energy, so if it's dropped - // for lack of energy, it's a cheap way to refuel it. Find - // some other way to cope with that problem - such as a manual - // charger? - if (mainAI != null) { mainAI.abort(); } diff --git a/common/buildcraft/robots/statements/ActionRobotWakeUp.java b/common/buildcraft/robots/statements/ActionRobotWakeUp.java index 783b5955..d7eb3abc 100755 --- a/common/buildcraft/robots/statements/ActionRobotWakeUp.java +++ b/common/buildcraft/robots/statements/ActionRobotWakeUp.java @@ -35,7 +35,7 @@ public class ActionRobotWakeUp extends BCStatement implements IActionInternal { @Override public void actionActivate(IStatementContainer source, IStatementParameter[] parameters) { - // TODO Auto-generated method stub + } } diff --git a/common/buildcraft/transport/Gate.java b/common/buildcraft/transport/Gate.java index a52a71ae..e820c963 100644 --- a/common/buildcraft/transport/Gate.java +++ b/common/buildcraft/transport/Gate.java @@ -109,7 +109,7 @@ public final class Gate implements IGate, IStatementContainer { } public void setAction(int position, IStatement action) { - // HUGE HACK! TODO - Remove in 6.3 API rewrite by adding + // HUGE HACK! TODO - Remove in an API rewrite by adding // ways for actions to fix their state on removal. if (actions[position] instanceof ActionValve && pipe != null && pipe.transport != null) { for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java index ffcd7c2c..054b7b08 100644 --- a/common/buildcraft/transport/ItemPipe.java +++ b/common/buildcraft/transport/ItemPipe.java @@ -102,11 +102,10 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe { ((TileGenericPipe) tile).initializeFromItemMetadata(itemstack.getItemDamage()); } - // TODO: Fix sound - //world.playSoundEffect(i + 0.5F, j + 0.5F, k + 0.5F, - // block.stepSound.getPlaceSound(), - // (block.stepSound.getVolume() + 1.0F) / 2.0F, - // block.stepSound.getPitch() * 0.8F); + world.playSoundEffect(i + 0.5F, j + 0.5F, k + 0.5F, + block.stepSound.func_150496_b(), + (block.stepSound.getVolume() + 1.0F) / 2.0F, + block.stepSound.getPitch() * 0.8F); itemstack.stackSize--; } diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 46ccecca..4b2f678a 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -133,19 +133,6 @@ public class PipePowerWood extends Pipe implements IPipeTran int energyToRemove = Math.min(battery.getEnergyStored(), requestedEnergy); - // TODO: Have energyToRemove be precalculated - // and used in receiveEnergy and extractEnergy. - // That way, we can replicate BC behaviour more accurately, - // but we still need to see how well that works with constant power. - - /* if (mjStored > 40) { - energyToRemove = mjStored / 40 + 4; - } else if (mjStored > 10) { - energyToRemove = mjStored / 10; - } else { - energyToRemove = 1; - } */ - energyToRemove /= sources; if (battery.getEnergyStored() > 0) { diff --git a/common/buildcraft/transport/render/PipeRendererWorld.java b/common/buildcraft/transport/render/PipeRendererWorld.java index 23b4c211..a25d5159 100644 --- a/common/buildcraft/transport/render/PipeRendererWorld.java +++ b/common/buildcraft/transport/render/PipeRendererWorld.java @@ -171,7 +171,7 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - // TODO Auto-generated method stub + // Done with a special item renderer } @Override diff --git a/common/buildcraft/transport/statements/ActionEnergyPulsar.java b/common/buildcraft/transport/statements/ActionEnergyPulsar.java index 91fda04d..05372a63 100644 --- a/common/buildcraft/transport/statements/ActionEnergyPulsar.java +++ b/common/buildcraft/transport/statements/ActionEnergyPulsar.java @@ -35,7 +35,6 @@ public class ActionEnergyPulsar extends BCStatement implements IActionInternal { @Override public void actionActivate(IStatementContainer source, IStatementParameter[] parameters) { - // TODO Auto-generated method stub } } diff --git a/common/buildcraft/transport/statements/ActionPipeDirection.java b/common/buildcraft/transport/statements/ActionPipeDirection.java index c1c97c0d..af809b49 100644 --- a/common/buildcraft/transport/statements/ActionPipeDirection.java +++ b/common/buildcraft/transport/statements/ActionPipeDirection.java @@ -49,7 +49,6 @@ public class ActionPipeDirection extends BCStatement implements IActionInternal @Override public void actionActivate(IStatementContainer source, IStatementParameter[] parameters) { - // TODO Auto-generated method stub } } From 2f744f1c6b8f341da91b52d251a291eedce28030 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 26 Feb 2015 19:07:29 +0100 Subject: [PATCH 65/67] remove dropBrokenBlocks option (was mostly dummy), add markerRange config (currently capped at 64) --- common/buildcraft/BuildCraftBuilders.java | 9 +++++ common/buildcraft/BuildCraftCore.java | 23 +++++-------- common/buildcraft/BuildCraftEnergy.java | 26 +++++++------- common/buildcraft/BuildCraftFactory.java | 4 +-- common/buildcraft/BuildCraftSilicon.java | 4 +-- common/buildcraft/BuildCraftTransport.java | 14 ++++---- common/buildcraft/builders/TileMarker.java | 17 +++++----- .../buildcraft/builders/TilePathMarker.java | 7 ++-- common/buildcraft/core/DefaultProps.java | 1 + .../core/blueprints/BptBuilderBase.java | 34 +++++++++++++++++++ .../core/blueprints/BptBuilderBlueprint.java | 30 +--------------- .../core/blueprints/BptBuilderTemplate.java | 6 ++-- common/buildcraft/core/utils/BlockUtils.java | 2 +- 13 files changed, 93 insertions(+), 84 deletions(-) diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java index 10177fd6..9d8c885d 100644 --- a/common/buildcraft/BuildCraftBuilders.java +++ b/common/buildcraft/BuildCraftBuilders.java @@ -167,6 +167,7 @@ public class BuildCraftBuilders extends BuildCraftMod { public static BlueprintDatabase clientDB; public static boolean debugPrintSchematicList = false; + public static boolean dropBrokenBlocks = false; @Mod.EventHandler public void loadConfiguration(FMLPreInitializationEvent evt) { @@ -197,6 +198,14 @@ public class BuildCraftBuilders extends BuildCraftMod { for (int i = 0; i < blueprintLibraryInput.length; ++i) { blueprintLibraryInput[i] = JavaTools.stripSurroundingQuotes(replacePathVariables(blueprintLibraryInput[i])); } + + //Property dropBlock = BuildCraftCore.mainConfiguration.get("general", "builder.dropBrokenBlocks", false, "set to true to force the builder to drop broken blocks"); + //dropBrokenBlocks = dropBlock.getBoolean(false); + + Property markerRange = BuildCraftCore.mainConfiguration.get("general", "marker.range", 64, "Set the default marker range. Setting it too high might cause lag and general weirdness, so watch out!"); + markerRange.setMinValue(8); + markerRange.setMaxValue(64); + DefaultProps.MARKER_RANGE = markerRange.getInt(); Property printSchematicList = BuildCraftCore.mainConfiguration.get("debug", "blueprints.printSchematicList", false); debugPrintSchematicList = printSchematicList.getBoolean(); diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index dbbb2b29..822d50a2 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -201,7 +201,6 @@ public class BuildCraftCore extends BuildCraftMod { public static boolean debugWorldgen = false; public static boolean modifyWorld = false; public static boolean colorBlindMode = false; - public static boolean dropBrokenBlocks = true; // Set to false to prevent the filler from dropping broken blocks. public static boolean hidePowerNumbers = false; public static boolean hideFluidNumbers = false; public static int itemLifespan = 1200; @@ -314,36 +313,32 @@ public class BuildCraftCore extends BuildCraftMod { try { mainConfiguration.load(); - Property updateCheck = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "update.check", true); + Property updateCheck = BuildCraftCore.mainConfiguration.get("general", "update.check", true); updateCheck.comment = "set to true for version check on startup"; if (updateCheck.getBoolean(true)) { Version.check(); } - Property dropBlock = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "dropBrokenBlocks", true); - dropBlock.comment = "set to false to prevent fillers from dropping blocks."; - dropBrokenBlocks = dropBlock.getBoolean(true); - - Property hideRFNumbers = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "hidePowerNumbers", false); + Property hideRFNumbers = BuildCraftCore.mainConfiguration.get("general", "hidePowerNumbers", false); hideRFNumbers.comment = "set to true to not display any RF or RF/t numbers."; hidePowerNumbers = hideRFNumbers.getBoolean(false); - Property hideMBNumbers = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "hideFluidNumbers", false); + Property hideMBNumbers = BuildCraftCore.mainConfiguration.get("general", "hideFluidNumbers", false); hideMBNumbers.comment = "set to true to not display any mB or mB/t numbers."; hideFluidNumbers = hideMBNumbers.getBoolean(false); - Property lifespan = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "itemLifespan", itemLifespan); + Property lifespan = BuildCraftCore.mainConfiguration.get("general", "itemLifespan", itemLifespan); lifespan.comment = "the lifespan in ticks of items dropped on the ground by pipes and machines, vanilla = 6000, default = 1200"; itemLifespan = lifespan.getInt(itemLifespan); if (itemLifespan < 100) { itemLifespan = 100; } - Property factor = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "network.updateFactor", 10); + Property factor = BuildCraftCore.mainConfiguration.get("general", "network.updateFactor", 10); factor.comment = "increasing this number will decrease network update frequency, useful for overloaded servers"; updateFactor = factor.getInt(10); - Property longFactor = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "network.stateRefreshPeriod", 40); + Property longFactor = BuildCraftCore.mainConfiguration.get("general", "network.stateRefreshPeriod", 40); longFactor.comment = "delay between full client sync packets, increasing it saves bandwidth, decreasing makes for better client syncronization."; longUpdateFactor = longFactor.getInt(40); @@ -356,7 +351,7 @@ public class BuildCraftCore extends BuildCraftMod { listItem = (new ItemList()).setUnlocalizedName("list"); CoreProxy.proxy.registerItem(listItem); - Property modifyWorldProp = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "modifyWorld", true); + Property modifyWorldProp = BuildCraftCore.mainConfiguration.get("general", "modifyWorld", true); modifyWorldProp.comment = "set to false if BuildCraft should not generate custom blocks (e.g. oil)"; modifyWorld = modifyWorldProp.getBoolean(true); @@ -366,7 +361,7 @@ public class BuildCraftCore extends BuildCraftMod { CoreProxy.proxy.registerBlock(springBlock, ItemSpring.class); } - Property consumeWater = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "consumeWater", consumeWaterSources); + Property consumeWater = BuildCraftCore.mainConfiguration.get("general", "consumeWater", consumeWaterSources); consumeWaterSources = consumeWater.getBoolean(consumeWaterSources); consumeWater.comment = "set to true if the Pump should consume water"; @@ -481,7 +476,7 @@ public class BuildCraftCore extends BuildCraftMod { MinecraftForge.EVENT_BUS.register(new SpringPopulate()); } - for (String l : BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, + for (String l : BuildCraftCore.mainConfiguration.get("general", "recipesBlacklist", new String[0]).getStringList()) { recipesBlacklist.add(JavaTools.stripSurroundingQuotes(l.trim())); } diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index f2b53831..26cd6d02 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -120,39 +120,39 @@ public class BuildCraftEnergy extends BuildCraftMod { public void preInit(FMLPreInitializationEvent evt) { int oilDesertBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "biomeOilDesert", DefaultProps.BIOME_OIL_DESERT).getInt(DefaultProps.BIOME_OIL_DESERT); int oilOceanBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "biomeOilOcean", DefaultProps.BIOME_OIL_OCEAN).getInt(DefaultProps.BIOME_OIL_OCEAN); - canOilBurn = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "burnOil", true, "Can oil burn?").getBoolean(true); - isOilDense = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "denseOil", true, "Should it be hard to swim in oil?").getBoolean(true); - oilWellScalar = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "oilWellGenerationRate", 1.0, "Probability of oil well generation").getDouble(1.0); - canEnginesExplode = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "enginesExplode", false, "Do engines explode upon overheat?").getBoolean(false); + canOilBurn = BuildCraftCore.mainConfiguration.get("general", "burnOil", true, "Can oil burn?").getBoolean(true); + isOilDense = BuildCraftCore.mainConfiguration.get("general", "denseOil", true, "Should it be hard to swim in oil?").getBoolean(true); + oilWellScalar = BuildCraftCore.mainConfiguration.get("general", "oilWellGenerationRate", 1.0, "Probability of oil well generation").getDouble(1.0); + canEnginesExplode = BuildCraftCore.mainConfiguration.get("general", "enginesExplode", false, "Do engines explode upon overheat?").getBoolean(false); setBiomeList( OilPopulate.INSTANCE.surfaceDepositBiomes, BuildCraftCore.mainConfiguration - .get(Configuration.CATEGORY_GENERAL, "oil.increasedBiomeIDs", + .get("general", "oil.increasedBiomeIDs", new String[] {BiomeDictionary.Type.SANDY.toString(), BiomeGenBase.taiga.biomeName}, "IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have increased oil generation rates.")); setBiomeList( OilPopulate.INSTANCE.excessiveBiomes, BuildCraftCore.mainConfiguration - .get(Configuration.CATEGORY_GENERAL, + .get("general", "oil.excessiveBiomeIDs", new String[] {}, "IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that should have GREATLY increased oil generation rates.")); setBiomeList(OilPopulate.INSTANCE.excludedBiomes, BuildCraftCore.mainConfiguration - .get(Configuration.CATEGORY_GENERAL, "oil.excludeBiomeIDs", + .get("general", "oil.excludeBiomeIDs", new String[] {BiomeGenBase.sky.biomeName, BiomeGenBase.hell.biomeName}, "IDs or Biome Types (e.g. SANDY,OCEAN) of biomes that are excluded from generating oil.")); - double fuelLavaMultiplier = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "fuel.lava.combustion", 1.0F, "adjust energy value of Lava in Combustion Engines").getDouble(1.0F); - double fuelOilMultiplier = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "fuel.oil.combustion", 1.0F, "adjust energy value of Oil in Combustion Engines").getDouble(1.0F); - double fuelFuelMultiplier = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "fuel.fuel.combustion", 1.0F, "adjust energy value of Fuel in Combustion Engines").getDouble(1.0F); + double fuelLavaMultiplier = BuildCraftCore.mainConfiguration.get("general", "fuel.lava.combustion", 1.0F, "adjust energy value of Lava in Combustion Engines").getDouble(1.0F); + double fuelOilMultiplier = BuildCraftCore.mainConfiguration.get("general", "fuel.oil.combustion", 1.0F, "adjust energy value of Oil in Combustion Engines").getDouble(1.0F); + double fuelFuelMultiplier = BuildCraftCore.mainConfiguration.get("general", "fuel.fuel.combustion", 1.0F, "adjust energy value of Fuel in Combustion Engines").getDouble(1.0F); - int fuelLavaEnergyOutput = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "fuel.lava.combustion.energyOutput", 20, "adjust output energy by Lava in Combustion Engines").getInt(20); - int fuelOilEnergyOutput = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "fuel.oil.combustion.energyOutput", 30, "adjust output energy by Oil in Combustion Engines").getInt(30); - int fuelFuelEnergyOutput = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "fuel.fuel.combustion.energyOutput", 60, "adjust output energy by Fuel in Combustion Engines").getInt(60); + int fuelLavaEnergyOutput = BuildCraftCore.mainConfiguration.get("general", "fuel.lava.combustion.energyOutput", 20, "adjust output energy by Lava in Combustion Engines").getInt(20); + int fuelOilEnergyOutput = BuildCraftCore.mainConfiguration.get("general", "fuel.oil.combustion.energyOutput", 30, "adjust output energy by Oil in Combustion Engines").getInt(30); + int fuelFuelEnergyOutput = BuildCraftCore.mainConfiguration.get("general", "fuel.fuel.combustion.energyOutput", 60, "adjust output energy by Fuel in Combustion Engines").getInt(60); BuildCraftCore.mainConfiguration.save(); diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index e9aeb5e8..6c6d7bab 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -176,7 +176,7 @@ public class BuildCraftFactory extends BuildCraftMod { channels = NetworkRegistry.INSTANCE.newChannel (DefaultProps.NET_CHANNEL_NAME + "-FACTORY", new BuildCraftChannelHandler(), new PacketHandlerFactory()); - ConfigUtils genCat = new ConfigUtils(BuildCraftCore.mainConfiguration, Configuration.CATEGORY_GENERAL); + ConfigUtils genCat = new ConfigUtils(BuildCraftCore.mainConfiguration, "general"); allowMining = genCat.get("mining.enabled", true, "disables the recipes for automated mining machines"); quarryOneTimeUse = genCat.get("quarry.one.time.use", false, "Quarry cannot be picked back up after placement"); @@ -184,7 +184,7 @@ public class BuildCraftFactory extends BuildCraftMod { miningDepth = genCat.get("mining.depth", 2, 256, 256, "how far below the machine can mining machines dig, range (2 - 256), default 256"); quarryLoadsChunks = genCat.get("quarry.loads.chunks", true, "Quarry loads chunks required for mining"); - Property pumpList = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "pumping.controlList", DefaultProps.PUMP_DIMENSION_LIST); + Property pumpList = BuildCraftCore.mainConfiguration.get("general", "pumping.controlList", DefaultProps.PUMP_DIMENSION_LIST); pumpList.comment = "Allows admins to whitelist or blacklist pumping of specific fluids in specific dimensions.\n" + "Eg. \"-/-1/Lava\" will disable lava in the nether. \"-/*/Lava\" will disable lava in any dimension. \"+/0/*\" will enable any fluid in the overworld.\n" + "Entries are comma seperated, banned fluids have precedence over allowed ones." diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 66674077..34b20345 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -138,10 +138,10 @@ public class BuildCraftSilicon extends BuildCraftMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { - chipsetCostMultiplier = BuildCraftCore.mainConfiguration.getFloat("chipset.costMultiplier", Configuration.CATEGORY_GENERAL, 1.0F, 0.001F, 1000.0F, "The multiplier for chipset recipe cost."); + chipsetCostMultiplier = BuildCraftCore.mainConfiguration.getFloat("chipset.costMultiplier", "general", 1.0F, 0.001F, 1000.0F, "The multiplier for chipset recipe cost."); blacklistedRobots = new ArrayList(); - blacklistedRobots.addAll(Arrays.asList(BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "boards.blacklist", new String[]{}).getStringList())); + blacklistedRobots.addAll(Arrays.asList(BuildCraftCore.mainConfiguration.get("general", "boards.blacklist", new String[]{}).getStringList())); BuildCraftCore.mainConfiguration.save(); diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index 782da71c..ef4763a8 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -257,21 +257,21 @@ public class BuildCraftTransport extends BuildCraftMod { @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { try { - Property durability = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "pipes.durability", DefaultProps.PIPES_DURABILITY); + Property durability = BuildCraftCore.mainConfiguration.get("general", "pipes.durability", DefaultProps.PIPES_DURABILITY); durability.comment = "How long a pipe will take to break"; pipeDurability = (float) durability.getDouble(DefaultProps.PIPES_DURABILITY); - Property baseFlowRate = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "pipes.fluids.baseFlowRate", DefaultProps.PIPES_FLUIDS_BASE_FLOW_RATE); + Property baseFlowRate = BuildCraftCore.mainConfiguration.get("general", "pipes.fluids.baseFlowRate", DefaultProps.PIPES_FLUIDS_BASE_FLOW_RATE); pipeFluidsBaseFlowRate = baseFlowRate.getInt(); Property printFacadeList = BuildCraftCore.mainConfiguration.get("debug", "facades.printFacadeList", false); debugPrintFacadeList = printFacadeList.getBoolean(); - Property enableAdditionalWaterproofingRecipe = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "pipes.fluids.enableAdditionalWaterproofingRecipe", true); + Property enableAdditionalWaterproofingRecipe = BuildCraftCore.mainConfiguration.get("general", "pipes.fluids.enableAdditionalWaterproofingRecipe", true); enableAdditionalWaterproofingRecipe.comment = "Enable the slimeball based pipe waterproofing recipe"; additionalWaterproofingRecipe = enableAdditionalWaterproofingRecipe.getBoolean(); - gateCostMultiplier = BuildCraftCore.mainConfiguration.getFloat("gate.recipeCostMultiplier", Configuration.CATEGORY_GENERAL, 1.0F, 0.001F, 1000.0F, "The multiplier for gate recipe cost."); + gateCostMultiplier = BuildCraftCore.mainConfiguration.getFloat("gate.recipeCostMultiplier", "general", 1.0F, 0.001F, 1000.0F, "The multiplier for gate recipe cost."); filteredBufferBlock = new BlockFilteredBuffer(); CoreProxy.proxy.registerBlock(filteredBufferBlock.setBlockName("filteredBufferBlock")); @@ -280,11 +280,11 @@ public class BuildCraftTransport extends BuildCraftMod { GateExpansions.registerExpansion(GateExpansionTimer.INSTANCE); GateExpansions.registerExpansion(GateExpansionRedstoneFader.INSTANCE); - Property groupItemsTriggerProp = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "pipes.groupItemsTrigger", 32); + Property groupItemsTriggerProp = BuildCraftCore.mainConfiguration.get("general", "pipes.groupItemsTrigger", 32); groupItemsTriggerProp.comment = "when reaching this amount of objects in a pipes, items will be automatically grouped"; groupItemsTrigger = groupItemsTriggerProp.getInt(); - Property facadeBlacklistProp = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "facade.blacklist", new String[] { + Property facadeBlacklistProp = BuildCraftCore.mainConfiguration.get("general", "facade.blacklist", new String[] { Block.blockRegistry.getNameForObject(Blocks.bedrock), Block.blockRegistry.getNameForObject(Blocks.command_block), Block.blockRegistry.getNameForObject(Blocks.end_portal_frame), @@ -314,7 +314,7 @@ public class BuildCraftTransport extends BuildCraftMod { facadeBlacklistProp.comment = "Blocks listed here will not have facades created. The format is modid:blockname.\nFor mods with a | character, the value needs to be surrounded with quotes."; facadeBlacklist = facadeBlacklistProp.getStringList(); - Property facadeAsWhitelist = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "facade.treatBlacklistAsWhitelist", false); + Property facadeAsWhitelist = BuildCraftCore.mainConfiguration.get("general", "facade.treatBlacklistAsWhitelist", false); facadeTreatBlacklistAsWhitelist = facadeAsWhitelist.getBoolean(); pipeWaterproof = new ItemBuildCraft(); diff --git a/common/buildcraft/builders/TileMarker.java b/common/buildcraft/builders/TileMarker.java index cf6c2325..a59baad5 100644 --- a/common/buildcraft/builders/TileMarker.java +++ b/common/buildcraft/builders/TileMarker.java @@ -19,6 +19,7 @@ import buildcraft.BuildCraftBuilders; import buildcraft.api.core.IAreaProvider; import buildcraft.api.core.ISerializable; import buildcraft.api.core.Position; +import buildcraft.core.DefaultProps; import buildcraft.core.EntityBlock; import buildcraft.core.LaserKind; import buildcraft.core.TileBuildCraft; @@ -26,8 +27,6 @@ import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.Utils; public class TileMarker extends TileBuildCraft implements IAreaProvider { - private static int maxSize = 64; - public static class TileWrapper implements ISerializable { public int x, y, z; @@ -155,23 +154,23 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider { if (showSignals) { signals = new EntityBlock[6]; if (!origin.isSet() || !origin.vect[0].isSet()) { - signals[0] = Utils.createLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord + maxSize - 1, yCoord, zCoord), + signals[0] = Utils.createLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord + DefaultProps.MARKER_RANGE - 1, yCoord, zCoord), LaserKind.Blue); - signals[1] = Utils.createLaser(worldObj, new Position(xCoord - maxSize + 1, yCoord, zCoord), new Position(xCoord, yCoord, zCoord), + signals[1] = Utils.createLaser(worldObj, new Position(xCoord - DefaultProps.MARKER_RANGE + 1, yCoord, zCoord), new Position(xCoord, yCoord, zCoord), LaserKind.Blue); } if (!origin.isSet() || !origin.vect[1].isSet()) { - signals[2] = Utils.createLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord, yCoord + maxSize - 1, zCoord), + signals[2] = Utils.createLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord, yCoord + DefaultProps.MARKER_RANGE - 1, zCoord), LaserKind.Blue); - signals[3] = Utils.createLaser(worldObj, new Position(xCoord, yCoord - maxSize + 1, zCoord), new Position(xCoord, yCoord, zCoord), + signals[3] = Utils.createLaser(worldObj, new Position(xCoord, yCoord - DefaultProps.MARKER_RANGE + 1, zCoord), new Position(xCoord, yCoord, zCoord), LaserKind.Blue); } if (!origin.isSet() || !origin.vect[2].isSet()) { - signals[4] = Utils.createLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord, yCoord, zCoord + maxSize - 1), + signals[4] = Utils.createLaser(worldObj, new Position(xCoord, yCoord, zCoord), new Position(xCoord, yCoord, zCoord + DefaultProps.MARKER_RANGE - 1), LaserKind.Blue); - signals[5] = Utils.createLaser(worldObj, new Position(xCoord, yCoord, zCoord - maxSize + 1), new Position(xCoord, yCoord, zCoord), + signals[5] = Utils.createLaser(worldObj, new Position(xCoord, yCoord, zCoord - DefaultProps.MARKER_RANGE + 1), new Position(xCoord, yCoord, zCoord), LaserKind.Blue); } } @@ -218,7 +217,7 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider { coords[2] = zCoord; if (!origin.isSet() || !origin.vect[n].isSet()) { - for (int j = 1; j < maxSize; ++j) { + for (int j = 1; j < DefaultProps.MARKER_RANGE; ++j) { coords[n] += j; Block block = worldObj.getBlock(coords[0], coords[1], coords[2]); diff --git a/common/buildcraft/builders/TilePathMarker.java b/common/buildcraft/builders/TilePathMarker.java index 59f97b77..17d0f2ba 100644 --- a/common/buildcraft/builders/TilePathMarker.java +++ b/common/buildcraft/builders/TilePathMarker.java @@ -20,15 +20,12 @@ import net.minecraft.world.World; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.Position; +import buildcraft.core.DefaultProps; import buildcraft.core.LaserData; public class TilePathMarker extends TileMarker { - - // TODO: this should be moved to default props // A list with the pathMarkers that aren't fully connected // It only contains markers within the loaded chunks - public static int searchSize = 64; - private static LinkedList availableMarkers = new LinkedList(); public int x0, y0, z0, x1, y1, z1; @@ -94,7 +91,7 @@ public class TilePathMarker extends TileMarker { distance = Math.sqrt(Math.pow(this.xCoord - t.xCoord, 2) + Math.pow(this.yCoord - t.yCoord, 2) + Math.pow(this.zCoord - t.zCoord, 2)); - if (distance > searchSize) { + if (distance > DefaultProps.MARKER_RANGE) { continue; } diff --git a/common/buildcraft/core/DefaultProps.java b/common/buildcraft/core/DefaultProps.java index 17d140d9..ec3f4442 100644 --- a/common/buildcraft/core/DefaultProps.java +++ b/common/buildcraft/core/DefaultProps.java @@ -17,6 +17,7 @@ public final class DefaultProps { public static final String NET_CHANNEL_NAME = "BC"; public static int NETWORK_UPDATE_RANGE = 64; + public static int MARKER_RANGE = 64; public static int PIPE_CONTENTS_RENDER_DIST = 24; public static String TEXTURE_PATH_GUI = "textures/gui"; diff --git a/common/buildcraft/core/blueprints/BptBuilderBase.java b/common/buildcraft/core/blueprints/BptBuilderBase.java index 40a32fd0..a89d8a03 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBase.java +++ b/common/buildcraft/core/blueprints/BptBuilderBase.java @@ -14,19 +14,27 @@ import java.util.LinkedList; import org.apache.logging.log4j.Level; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.common.util.Constants; +import net.minecraftforge.event.world.BlockEvent; import buildcraft.BuildCraftBuilders; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.IBuilderContext; import buildcraft.api.blueprints.MappingNotFoundException; +import buildcraft.api.blueprints.SchematicBlock; +import buildcraft.api.blueprints.SchematicBlockBase; import buildcraft.api.core.BCLog; import buildcraft.api.core.BlockIndex; import buildcraft.api.core.IAreaProvider; @@ -37,6 +45,7 @@ import buildcraft.core.builders.BuildingSlot; import buildcraft.core.builders.BuildingSlotBlock; import buildcraft.core.builders.IBuildingItemsProvider; import buildcraft.core.builders.TileAbstractBuilder; +import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtils; public abstract class BptBuilderBase implements IAreaProvider { @@ -272,4 +281,29 @@ public abstract class BptBuilderBase implements IAreaProvider { } } } + + protected boolean isBlockBreakCanceled(World world, int x, int y, int z) { + if (!world.isAirBlock(x, y, z)) { + BlockEvent.BreakEvent breakEvent = new BlockEvent.BreakEvent(x, y, z, world, world.getBlock(x, y, z), + world.getBlockMetadata(x, y, z), + CoreProxy.proxy.getBuildCraftPlayer((WorldServer) world).get()); + MinecraftForge.EVENT_BUS.post(breakEvent); + return breakEvent.isCanceled(); + } + return false; + } + + protected boolean isBlockPlaceCanceled(World world, int x, int y, int z, SchematicBlockBase schematic) { + Block block = schematic instanceof SchematicBlock ? ((SchematicBlock) schematic).block : Blocks.stone; + int meta = schematic instanceof SchematicBlock ? ((SchematicBlock) schematic).meta : 0; + + BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent( + new BlockSnapshot(world, x, y, z, block, meta), + Blocks.air, + CoreProxy.proxy.getBuildCraftPlayer((WorldServer) world, x, y, z).get() + ); + + MinecraftForge.EVENT_BUS.post(placeEvent); + return placeEvent.isCanceled(); + } } diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 1769b692..42376c56 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -205,9 +205,7 @@ public class BptBuilderBlueprint extends BptBuilderBase { initialize(); for (BuildingSlotBlock b : buildList) { - if (b.mode == Mode.ClearIfInvalid) { - context.world.setBlockToAir(b.x, b.y, b.z); - } else if (!b.schematic.doNotBuild()) { + if (!b.schematic.doNotBuild()) { b.stackConsumed = new LinkedList(); try { @@ -430,32 +428,6 @@ public class BptBuilderBlueprint extends BptBuilderBase { return null; } - private boolean isBlockBreakCanceled(World world, int x, int y, int z) { - if (!world.isAirBlock(x, y, z)) { - BlockEvent.BreakEvent breakEvent = new BlockEvent.BreakEvent(x, y, z, world, world.getBlock(x, y, z), - world.getBlockMetadata(x, y, z), - CoreProxy.proxy.getBuildCraftPlayer((WorldServer) world).get()); - MinecraftForge.EVENT_BUS.post(breakEvent); - return breakEvent.isCanceled(); - } - return false; - } - - private boolean isBlockPlaceCanceled(World world, int x, int y, int z, SchematicBlockBase schematic) { - Block block = schematic instanceof SchematicBlock ? ((SchematicBlock) schematic).block : Blocks.stone; - int meta = schematic instanceof SchematicBlock ? ((SchematicBlock) schematic).meta : 0; - - BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent( - new BlockSnapshot(world, x, y, z, block, meta), - Blocks.air, - CoreProxy.proxy.getBuildCraftPlayer((WorldServer) world, x, y, z).get() - ); - - MinecraftForge.EVENT_BUS.post(placeEvent); - return placeEvent.isCanceled(); - } - - private BuildingSlot internalGetNextEntity(World world, TileAbstractBuilder builder) { Iterator it = entityList.iterator(); diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java index e0c84025..81adbba3 100644 --- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java +++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java @@ -162,7 +162,8 @@ public class BptBuilderTemplate extends BptBuilderBase { return null; } - if (BlockUtils.isUnbreakableBlock(world, slot.x, slot.y, slot.z)) { + if (BlockUtils.isUnbreakableBlock(world, slot.x, slot.y, slot.z) + || isBlockBreakCanceled(world, slot.x, slot.y, slot.z)) { iterator.remove(); if (slot.mode == Mode.ClearIfInvalid) { clearedLocations.add(new BlockIndex(slot.x, slot.y, slot.z)); @@ -186,7 +187,8 @@ public class BptBuilderTemplate extends BptBuilderBase { } } } else if (slot.mode == Mode.Build) { - if (!BuildCraftAPI.isSoftBlock(world, slot.x, slot.y, slot.z)) { + if (!BuildCraftAPI.isSoftBlock(world, slot.x, slot.y, slot.z) + || isBlockPlaceCanceled(world, x, y, z, slot.schematic)) { iterator.remove(); builtLocations.add(new BlockIndex(slot.x, slot.y, slot.z)); } else { diff --git a/common/buildcraft/core/utils/BlockUtils.java b/common/buildcraft/core/utils/BlockUtils.java index ce5da2c9..9865bec8 100644 --- a/common/buildcraft/core/utils/BlockUtils.java +++ b/common/buildcraft/core/utils/BlockUtils.java @@ -86,7 +86,7 @@ public final class BlockUtils { return false; } - if (!world.isAirBlock(x, y, z) && BuildCraftCore.dropBrokenBlocks && !world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + if (!world.isAirBlock(x, y, z) && !world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { List items = getItemStackFromBlock(world, x, y, z); for (ItemStack item : items) { From 9306baa0e81e04336b9b894c4eefd9a1df15d8d9 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 26 Feb 2015 22:47:33 +0100 Subject: [PATCH 66/67] BuildCraft 6.4.1 --- .../recipes/IProgrammingRecipeManager.java | 1 - build.gradle | 2 +- buildcraft_resources/changelog/6.4.1 | 24 +++++++++++++++++++ buildcraft_resources/versions.txt | 2 +- common/buildcraft/BuildCraftCore.java | 1 - common/buildcraft/BuildCraftEnergy.java | 1 - common/buildcraft/BuildCraftFactory.java | 1 - common/buildcraft/BuildCraftSilicon.java | 1 - common/buildcraft/BuildCraftTransport.java | 1 - .../core/blueprints/BptBuilderBlueprint.java | 7 ------ 10 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 buildcraft_resources/changelog/6.4.1 diff --git a/api/buildcraft/api/recipes/IProgrammingRecipeManager.java b/api/buildcraft/api/recipes/IProgrammingRecipeManager.java index 666571e5..3dc2809b 100644 --- a/api/buildcraft/api/recipes/IProgrammingRecipeManager.java +++ b/api/buildcraft/api/recipes/IProgrammingRecipeManager.java @@ -9,7 +9,6 @@ package buildcraft.api.recipes; import java.util.Collection; -import net.minecraft.item.ItemStack; public interface IProgrammingRecipeManager { void addRecipe(IProgrammingRecipe recipe); diff --git a/build.gradle b/build.gradle index 6767df40..c4c03d1f 100755 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency apply plugin: 'maven' // for uploading to a maven repo apply plugin: 'checkstyle' -version = "6.4.0" +version = "6.4.1" group= "com.mod-buildcraft" archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] diff --git a/buildcraft_resources/changelog/6.4.1 b/buildcraft_resources/changelog/6.4.1 new file mode 100644 index 00000000..fedbeb62 --- /dev/null +++ b/buildcraft_resources/changelog/6.4.1 @@ -0,0 +1,24 @@ +Added: +* **Forge version bumped to build 1236.** You're probably on that version or higher by now either way. +* Programming Table! Use it to program Redstone Boards. (The old, random way is now gone!) + +Removed: +* dropBrokenBlocks config option (was broken either way) + +Fixed: +* [#2496] Spawning a quarry with a Stripes Pipe crashes the game if chunkloading is enabled (asie) +* [#2495] Incorrect energy overflow rendering (asie) +* [#2492] Robot charging crash on world join (AEnterprise) +* [#2490] Refinery only fills one of two tanks with oil (asie) +* [#2489] Builder allows overly free ore dictionary conversion (asie) +* [#2486] Crash after setting Go To Station with robots (hea3ven) +* [#2476] Builders not respecting player permissions (asie) +* [#2457] "Missing Texture" error in console (asie) +* [#2339] Incorrect Builder inventory checks (asie) +* Ledger open/close speed being FPS dependent (asie) +* "Low/High Energy Stored" trigger behaving in unexpected ways (asie) +* Maximum energy per tick not respected on multiple insertions per tick (asie) +* Minor energy bug (asie) +* Pipe items now emit sound on placement (asie) +* Random crash bugs from OpenEye (asie) +* Robots crashing upon attempt to charge if not programmed (asie) diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt index 04649a27..e2841c0e 100755 --- a/buildcraft_resources/versions.txt +++ b/buildcraft_resources/versions.txt @@ -1,3 +1,3 @@ 1.6.4:BuildCraft:4.2.2 1.7.2:BuildCraft:6.0.16 -1.7.10:BuildCraft:6.3.6 +1.7.10:BuildCraft:6.4.1 diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 822d50a2..76663dcd 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -50,7 +50,6 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.AchievementPage; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.fluids.BlockFluidBase; diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 26cd6d02..98c7d885 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -34,7 +34,6 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java index 6c6d7bab..43bee9da 100644 --- a/common/buildcraft/BuildCraftFactory.java +++ b/common/buildcraft/BuildCraftFactory.java @@ -33,7 +33,6 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import buildcraft.api.blueprints.BuilderAPI; diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java index 34b20345..291f73ce 100644 --- a/common/buildcraft/BuildCraftSilicon.java +++ b/common/buildcraft/BuildCraftSilicon.java @@ -25,7 +25,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraftforge.common.config.Configuration; import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.blueprints.BuilderAPI; diff --git a/common/buildcraft/BuildCraftTransport.java b/common/buildcraft/BuildCraftTransport.java index ef4763a8..81766ceb 100644 --- a/common/buildcraft/BuildCraftTransport.java +++ b/common/buildcraft/BuildCraftTransport.java @@ -30,7 +30,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.RecipeSorter; diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java index 42376c56..fb9ede67 100644 --- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java +++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java @@ -18,7 +18,6 @@ import java.util.LinkedList; import java.util.ListIterator; import java.util.Map.Entry; -import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -26,13 +25,9 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; import net.minecraft.world.WorldSettings.GameType; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -41,7 +36,6 @@ import net.minecraftforge.fluids.FluidStack; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.Schematic; import buildcraft.api.blueprints.SchematicBlock; -import buildcraft.api.blueprints.SchematicBlockBase; import buildcraft.api.blueprints.SchematicEntity; import buildcraft.api.core.BCLog; import buildcraft.api.core.BlockIndex; @@ -59,7 +53,6 @@ import buildcraft.core.builders.TileAbstractBuilder; import buildcraft.core.inventory.InventoryCopy; import buildcraft.core.inventory.InventoryIterator; import buildcraft.core.inventory.StackHelper; -import buildcraft.core.proxy.CoreProxy; import buildcraft.core.utils.BlockUtils; public class BptBuilderBlueprint extends BptBuilderBase { From 9cd089bdc0d595ac6ff9dfd75bd22ab1f3e63635 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Thu, 26 Feb 2015 22:54:15 +0100 Subject: [PATCH 67/67] real BC 6.4.1, fix incorrect filler texture --- .../assets/buildcraft/textures/gui/filler.png | Bin 368 -> 448 bytes buildcraft_resources/changelog/6.4.1 | 1 + 2 files changed, 1 insertion(+) diff --git a/buildcraft_resources/assets/buildcraft/textures/gui/filler.png b/buildcraft_resources/assets/buildcraft/textures/gui/filler.png index 8a949a384026465825b134f7dd6a698c7e36d15f..909f2028b95e88adb402e135142d490cac265d9c 100644 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+HJBz$e5tzbF^T?C$RV|Nnnz zXy~zH$IQ*mWp9`sfeI_YUQsCc?KhE&{od)JV!$w7ei!c#U0+eVgZ)9n01oIDi_ z-0$mIqz!LPP)%I?;P=&*SE3^GXEq6hSq8N|5jie%b2;<1NQR9vj4zCq*e+*Q0$Kq9 z2l^S;ecyiNK10rZA;vnk3;RX3H!5mB_*N6Z%L7$%nl0q7P({K8&go1$YS#R%m1crz zhR}aFAC#`W>uYi)nengJ3zLfipx^<5XKWR*nS8>$fyz(~7dlK}7WbaGD*#q>pbkti zFdV3Jz@g4Tn+>AoLRYC1kkzoxlU*ctvhvG@4JVl-KJS01V{gN!q@-jt+lHZkttQVc RURQRI22WQ%mvv4FO#nZ(eXRfh literal 368 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+HJBz$e5NNCQE4clZDQ|3gDV zj~zQ^Zf>6KyHy7$%2*QQ7tG-B>_!@p&FSgl7*cWT?Oj8@CIgAKhegai^A50-o0ghC zWMQ*u`flGenPt1#!+ys3<*$D9$iH>)+TC$0B&N9cMGW7Kc7~#8MhRxAcTXF5z!rjt z4QvNKo38%N`oKaPO$vj9Z(HAO5Ge#Ii*i|5axqAsN{ja4X!K@c7kA}3sh8WV!1QJY6++=t!