minor API cleanup

api/buildcraft/api/tools/IToolPipette.java

@@ -1,48 +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.tools;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-public interface IToolPipette {
-
-	/**
-	 * @param pipette
-	 *            ItemStack of the pipette.
-	 * @return Capacity of the pipette.
-	 */
-	int getCapacity(ItemStack pipette);
-
-	/**
-	 * @param pipette
-	 * @return true if the pipette can pipette.
-	 */
-	boolean canPipette(ItemStack pipette);
-
-	/**
-	 * Fills the pipette with the given liquid stack.
-	 *
-	 * @param pipette
-	 * @param liquid
-	 * @param doFill
-	 * @return Amount of liquid used in filling the pipette.
-	 */
-	int fill(ItemStack pipette, FluidStack liquid, boolean doFill);
-
-	/**
-	 * Drains liquid from the pipette
-	 *
-	 * @param pipette
-	 * @param maxDrain
-	 * @param doDrain
-	 * @return Fluid stack representing the liquid and amount drained from the pipette.
-	 */
-	FluidStack drain(ItemStack pipette, int maxDrain, boolean doDrain);
-}

api/buildcraft/api/transport/IPipeDefinition.java

@@ -1,26 +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.transport;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-
-public interface IPipeDefinition {
-
-	String getUniqueTag();
-
-	void registerIcons(IIconRegister iconRegister);
-
-	IIcon getIcon(int index);
-
-	IIcon getItemIcon();
-
-	PipeBehavior makePipeBehavior(TileEntity tile);
-}

api/buildcraft/api/transport/PipeBehavior.java

@@ -1,47 +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.transport;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
-public abstract class PipeBehavior {
-
-	public final TileEntity tile;
-
-	public PipeBehavior(TileEntity tile) {
-		this.tile = tile;
-	}
-
-	public void tick() {
-	}
-
-	public int getIconIndex(ForgeDirection side) {
-		return 0;
-	}
-
-	public void writeToNBT(NBTTagCompound nbt) {
-	}
-
-	public void readFromNBT(NBTTagCompound nbt) {
-	}
-
-	public boolean canPipeConnect(TileEntity tile, ForgeDirection side) {
-		return true;
-	}
-
-	public boolean blockActivated(EntityPlayer player) {
-		return false;
-	}
-
-	public void onNeighborBlockChange(int blockId) {
-	}
-}

common/buildcraft/builders/TileMarker.java

@@ -13,10 +13,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import buildcraft.BuildCraftBuilders;
 import buildcraft.api.core.IAreaProvider;
-import buildcraft.api.core.LaserKind;
 import buildcraft.api.core.NetworkData;
 import buildcraft.api.core.Position;
 import buildcraft.core.EntityBlock;
+import buildcraft.core.LaserKind;
 import buildcraft.core.TileBuildCraft;
 import buildcraft.core.network.PacketUpdate;
 import buildcraft.core.proxy.CoreProxy;

common/buildcraft/core/LaserKind.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.api.core;
+package buildcraft.core;
 
 public enum LaserKind {
 	Red, Blue, Stripes

common/buildcraft/core/proxy/CoreProxy.java

@@ -29,9 +29,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import buildcraft.api.core.ICoreProxy;
-import buildcraft.api.core.LaserKind;
 import buildcraft.core.EntityBlock;
 import buildcraft.core.ItemBlockBuildCraft;
+import buildcraft.core.LaserKind;
 
 import com.mojang.authlib.GameProfile;
 

common/buildcraft/core/proxy/CoreProxyClient.java

@@ -27,8 +27,8 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import buildcraft.BuildCraftCore;
-import buildcraft.api.core.LaserKind;
 import buildcraft.core.EntityBlock;
+import buildcraft.core.LaserKind;
 import buildcraft.core.render.RenderEntityBlock;
 import buildcraft.core.render.RenderRobot;
 import buildcraft.core.render.RenderingEntityBlocks;

common/buildcraft/core/utils/Utils.java

@@ -34,7 +34,6 @@ import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftCore;
 import buildcraft.api.core.IAreaProvider;
-import buildcraft.api.core.LaserKind;
 import buildcraft.api.core.Position;
 import buildcraft.api.transport.IPipeTile;
 import buildcraft.api.transport.IPipeTile.PipeType;
@@ -44,6 +43,7 @@ import buildcraft.core.EntityBlock;
 import buildcraft.core.IDropControlInventory;
 import buildcraft.core.IFramePipeConnection;
 import buildcraft.core.LaserData;
+import buildcraft.core.LaserKind;
 import buildcraft.core.TileBuildCraft;
 import buildcraft.core.inventory.ITransactor;
 import buildcraft.core.inventory.InvUtils;