Moved common API to seperate subpackage.

buildcraft_client/net/minecraft/src/buildcraft/energy/RenderEngine.java

@@ -15,7 +15,7 @@ import net.minecraft.src.ModelBase;
 import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.IInventoryRenderer;
 import net.minecraft.src.buildcraft.energy.Engine.EnergyStage;

buildcraft_client/net/minecraft/src/buildcraft/factory/GuiRefinery.java

@@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.factory;
 
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.liquids.LiquidManager;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
 import net.minecraft.src.buildcraft.api.recipes.RefineryRecipe;

buildcraft_client/net/minecraft/src/buildcraft/transport/PipeWorldRenderer.java

@@ -13,7 +13,7 @@ import net.minecraft.src.Item;
 import net.minecraft.src.ItemBlock;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.RenderBlocks;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.transport.IPipe;
 import net.minecraft.src.buildcraft.api.transport.IPipe.WireColor;
 import net.minecraft.src.buildcraft.core.DefaultProps;

buildcraft_client/net/minecraft/src/buildcraft/transport/RenderPipe.java

@@ -26,7 +26,7 @@ import net.minecraft.src.Tessellator;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.liquids.ILiquidTank;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
 import net.minecraft.src.buildcraft.api.transport.IPipedItem;

buildcraft_client/net/minecraft/src/mod_BuildCraftSilicon.java

@@ -9,7 +9,7 @@
 
 package net.minecraft.src;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.NetworkMod;

common/net/minecraft/src/BuildCraftCore.java

@@ -11,7 +11,7 @@ package net.minecraft.src;
 import java.io.File;
 import java.util.TreeMap;
 
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.gates.Action;
 import net.minecraft.src.buildcraft.api.gates.ActionManager;
 import net.minecraft.src.buildcraft.api.gates.Trigger;

common/net/minecraft/src/BuildCraftEnergy.java

@@ -11,7 +11,7 @@ package net.minecraft.src;
 import java.util.Random;
 import java.util.TreeMap;
 
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.fuels.IronEngineCoolant;
 import net.minecraft.src.buildcraft.api.fuels.IronEngineFuel;
 import net.minecraft.src.buildcraft.api.gates.Trigger;

common/net/minecraft/src/BuildCraftTransport.java

@@ -13,7 +13,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.gates.Action;
 import net.minecraft.src.buildcraft.api.gates.ActionManager;
 import net.minecraft.src.buildcraft.api.gates.Trigger;

common/net/minecraft/src/buildcraft/api/blueprints/BlueprintManager.java

@@ -3,7 +3,7 @@ package net.minecraft.src.buildcraft.api.blueprints;
 import net.minecraft.src.Block;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 
 public class BlueprintManager {
 

common/net/minecraft/src/buildcraft/api/blueprints/BptBlock.java

@@ -17,7 +17,7 @@ import net.minecraft.src.BlockContainer;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 
 /**
  * This class allow to specify specific behavior for blocks stored in

common/net/minecraft/src/buildcraft/api/blueprints/IBptContext.java

@@ -11,8 +11,8 @@ package net.minecraft.src.buildcraft.api.blueprints;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.IBox;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.IBox;
+import net.minecraft.src.buildcraft.api.core.Position;
 
 /**
  * This interface provide contextual information when building or initializing

common/net/minecraft/src/buildcraft/api/bptblocks/BptBlockSign.java

@@ -14,11 +14,11 @@ import java.util.LinkedList;
 import net.minecraft.src.Block;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.blueprints.BlockSignature;
 import net.minecraft.src.buildcraft.api.blueprints.BptBlock;
 import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo;
 import net.minecraft.src.buildcraft.api.blueprints.IBptContext;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public class BptBlockSign extends BptBlock {
 

common/net/minecraft/src/buildcraft/api/core/BuildCraftAPI.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.core;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -16,6 +16,7 @@ import net.minecraft.src.Block;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
+import net.minecraft.src.buildcraft.api.APIProxy;
 import net.minecraft.src.buildcraft.api.blueprints.BlueprintManager;
 import net.minecraft.src.buildcraft.api.blueprints.BptBlock;
 import net.minecraft.src.buildcraft.api.gates.Action;

common/net/minecraft/src/buildcraft/api/core/IAreaProvider.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.core;
 
 /**
  * To be implemented by TileEntities able to provide a square area on the world,

common/net/minecraft/src/buildcraft/api/core/IBox.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.core;
 
 import net.minecraft.src.World;
 

common/net/minecraft/src/buildcraft/api/core/LaserKind.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.core;
 
 public enum LaserKind {
 	Red, Blue, Stripes

common/net/minecraft/src/buildcraft/api/core/Orientations.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.core;
 
 public enum Orientations {
 	YNeg, // 0

common/net/minecraft/src/buildcraft/api/core/Position.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.core;
 
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;

common/net/minecraft/src/buildcraft/api/core/SafeTimeTracker.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api;
+package net.minecraft.src.buildcraft.api.core;
 
 import net.minecraft.src.World;
 

common/net/minecraft/src/buildcraft/api/filler/IFillerPattern.java

@@ -2,7 +2,7 @@ package net.minecraft.src.buildcraft.api.filler;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.api.core.IBox;
 
 public interface IFillerPattern {
 

common/net/minecraft/src/buildcraft/api/fuels/IronEngineFuel.java

@@ -12,7 +12,7 @@ package net.minecraft.src.buildcraft.api.fuels;
 import java.util.HashMap;
 import java.util.LinkedList;
 
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
 
 public class IronEngineFuel {

common/net/minecraft/src/buildcraft/api/inventory/ISecuredInventory.java

@@ -1,6 +1,6 @@
 package net.minecraft.src.buildcraft.api.inventory;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public interface ISecuredInventory {
 	

common/net/minecraft/src/buildcraft/api/inventory/ISelectiveInventory.java

@@ -1,7 +1,7 @@
 package net.minecraft.src.buildcraft.api.inventory;
 
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public interface ISelectiveInventory extends ISpecialInventory {
 	/**

common/net/minecraft/src/buildcraft/api/inventory/ISpecialInventory.java

@@ -2,7 +2,7 @@ package net.minecraft.src.buildcraft.api.inventory;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public interface ISpecialInventory extends IInventory {
 	

common/net/minecraft/src/buildcraft/api/liquids/ILiquidTank.java

@@ -1,6 +1,6 @@
 package net.minecraft.src.buildcraft.api.liquids;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public interface ILiquidTank {
 

common/net/minecraft/src/buildcraft/api/liquids/ITankContainer.java

@@ -1,6 +1,6 @@
 package net.minecraft.src.buildcraft.api.liquids;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public interface ITankContainer {
 	

common/net/minecraft/src/buildcraft/api/liquids/LiquidData.java

@@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.api.liquids;
 
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 
 public class LiquidData {
 

common/net/minecraft/src/buildcraft/api/power/IPowerProvider.java

@@ -1,8 +1,8 @@
 package net.minecraft.src.buildcraft.api.power;
 
 import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 
 public interface IPowerProvider {
 

common/net/minecraft/src/buildcraft/api/power/PowerProvider.java

@@ -11,8 +11,8 @@ package net.minecraft.src.buildcraft.api.power;
 
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 
 public abstract class PowerProvider implements IPowerProvider {
 

common/net/minecraft/src/buildcraft/api/transport/IPipeConnection.java

@@ -9,7 +9,7 @@
 
 package net.minecraft.src.buildcraft.api.transport;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public interface IPipeConnection {
 

common/net/minecraft/src/buildcraft/api/transport/IPipeEntry.java

@@ -9,7 +9,7 @@
 
 package net.minecraft.src.buildcraft.api.transport;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 /**
  * Interface used to put objects into pipes, implemented by pipe tile entities.

common/net/minecraft/src/buildcraft/api/transport/IPipedItem.java

@@ -5,9 +5,9 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 
 public interface IPipedItem {
 

common/net/minecraft/src/buildcraft/builders/BlockArchitect.java

@@ -22,8 +22,8 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.mod_BuildCraftBuilders;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.tools.IToolWrench;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiIds;

common/net/minecraft/src/buildcraft/builders/BlockBuilder.java

@@ -21,8 +21,8 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.mod_BuildCraftBuilders;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.tools.IToolWrench;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.GuiIds;

common/net/minecraft/src/buildcraft/builders/BptBlockFiller.java

@@ -14,12 +14,12 @@ import java.util.LinkedList;
 import net.minecraft.src.BuildCraftBuilders;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.buildcraft.api.LaserKind;
-import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.blueprints.BptBlock;
 import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo;
 import net.minecraft.src.buildcraft.api.blueprints.IBptContext;
 import net.minecraft.src.buildcraft.api.bptblocks.BptBlockUtils;
+import net.minecraft.src.buildcraft.api.core.LaserKind;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.core.Box;
 
 public class BptBlockFiller extends BptBlock {

common/net/minecraft/src/buildcraft/builders/FillerFillAll.java

@@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.api.core.IBox;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFillAll extends FillerPattern {

common/net/minecraft/src/buildcraft/builders/FillerFillPyramid.java

@@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.api.core.IBox;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFillPyramid extends FillerPattern {

common/net/minecraft/src/buildcraft/builders/FillerFillStairs.java

@@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.api.core.IBox;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFillStairs extends FillerPattern {

common/net/minecraft/src/buildcraft/builders/FillerFillWalls.java

@@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.api.core.IBox;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFillWalls extends FillerPattern {

common/net/minecraft/src/buildcraft/builders/FillerFlattener.java

@@ -11,8 +11,8 @@ package net.minecraft.src.buildcraft.builders;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.IBox;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerFlattener extends FillerPattern {

common/net/minecraft/src/buildcraft/builders/FillerPattern.java

@@ -14,8 +14,8 @@ import net.minecraft.src.BuildCraftBuilders;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.IBox;
 import net.minecraft.src.buildcraft.api.filler.IFillerPattern;
 
 public abstract class FillerPattern implements IFillerPattern {

common/net/minecraft/src/buildcraft/builders/FillerRemover.java

@@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.builders;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.IBox;
+import net.minecraft.src.buildcraft.api.core.IBox;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 
 public class FillerRemover extends FillerPattern {

common/net/minecraft/src/buildcraft/builders/TileArchitect.java

@@ -16,9 +16,9 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IAreaProvider;
-import net.minecraft.src.buildcraft.api.LaserKind;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.IAreaProvider;
+import net.minecraft.src.buildcraft.api.core.LaserKind;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.core.Box;
 import net.minecraft.src.buildcraft.core.BptBase;
 import net.minecraft.src.buildcraft.core.BptBlueprint;

common/net/minecraft/src/buildcraft/builders/TileBuilder.java

@@ -21,9 +21,9 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.LaserKind;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.LaserKind;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.power.IPowerProvider;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
 import net.minecraft.src.buildcraft.api.power.PowerFramework;

common/net/minecraft/src/buildcraft/builders/TileFiller.java

@@ -14,9 +14,9 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IAreaProvider;
-import net.minecraft.src.buildcraft.api.LaserKind;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.IAreaProvider;
+import net.minecraft.src.buildcraft.api.core.LaserKind;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.filler.FillerManager;
 import net.minecraft.src.buildcraft.api.filler.IFillerPattern;
 import net.minecraft.src.buildcraft.api.gates.IAction;

common/net/minecraft/src/buildcraft/builders/TileMarker.java

@@ -14,9 +14,9 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.Packet;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IAreaProvider;
-import net.minecraft.src.buildcraft.api.LaserKind;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.IAreaProvider;
+import net.minecraft.src.buildcraft.api.core.LaserKind;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.core.EntityBlock;
 import net.minecraft.src.buildcraft.core.TileBuildCraft;
 import net.minecraft.src.buildcraft.core.Utils;

common/net/minecraft/src/buildcraft/builders/TilePathMarker.java

@@ -7,7 +7,7 @@ import java.util.TreeSet;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.core.BlockIndex;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.EntityLaser;

common/net/minecraft/src/buildcraft/core/Box.java

@@ -15,10 +15,10 @@ import java.util.List;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IAreaProvider;
-import net.minecraft.src.buildcraft.api.IBox;
-import net.minecraft.src.buildcraft.api.LaserKind;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.IAreaProvider;
+import net.minecraft.src.buildcraft.api.core.IBox;
+import net.minecraft.src.buildcraft.api.core.LaserKind;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.core.network.TileNetworkData;
 
 public class Box implements IBox {

common/net/minecraft/src/buildcraft/core/BptBuilderBase.java

@@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.core;
 
 import net.minecraft.src.AxisAlignedBB;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.IAreaProvider;
+import net.minecraft.src.buildcraft.api.core.IAreaProvider;
 
 public abstract class BptBuilderBase implements IAreaProvider {
 

common/net/minecraft/src/buildcraft/core/BptBuilderBlueprint.java

@@ -18,7 +18,7 @@ import net.minecraft.src.Block;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 import net.minecraft.src.buildcraft.core.BptSlot.Mode;
 
 public class BptBuilderBlueprint extends BptBuilderBase {

common/net/minecraft/src/buildcraft/core/BptBuilderTemplate.java

@@ -13,7 +13,7 @@ import java.util.LinkedList;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 import net.minecraft.src.buildcraft.core.BptSlot.Mode;
 
 public class BptBuilderTemplate extends BptBuilderBase {

common/net/minecraft/src/buildcraft/core/BptContext.java

@@ -11,9 +11,9 @@ package net.minecraft.src.buildcraft.core;
 
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.IBox;
-import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.blueprints.IBptContext;
+import net.minecraft.src.buildcraft.api.core.IBox;
+import net.minecraft.src.buildcraft.api.core.Position;
 
 public class BptContext implements IBptContext {
 

common/net/minecraft/src/buildcraft/core/DefaultAreaProvider.java

@@ -9,7 +9,7 @@
 
 package net.minecraft.src.buildcraft.core;
 
-import net.minecraft.src.buildcraft.api.IAreaProvider;
+import net.minecraft.src.buildcraft.api.core.IAreaProvider;
 
 public class DefaultAreaProvider implements IAreaProvider {
 

common/net/minecraft/src/buildcraft/core/EntityEnergyLaser.java

@@ -10,7 +10,7 @@
 package net.minecraft.src.buildcraft.core;
 
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Position;
 
 public class EntityEnergyLaser extends EntityLaser {
 

common/net/minecraft/src/buildcraft/core/EntityLaser.java

@@ -17,7 +17,7 @@ import net.minecraft.src.Entity;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.forge.ISpawnHandler;
 
 public class EntityLaser extends Entity implements ISpawnHandler {

common/net/minecraft/src/buildcraft/core/EntityPassiveItem.java

@@ -20,9 +20,9 @@ import net.minecraft.src.NBTTagList;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 import net.minecraft.src.buildcraft.api.transport.IPassiveItemContribution;
 import net.minecraft.src.buildcraft.api.transport.IPipedItem;
 import net.minecraft.src.buildcraft.api.transport.PipeManager;

common/net/minecraft/src/buildcraft/core/EntityRobot.java

@@ -21,9 +21,9 @@ import net.minecraft.src.ModLoader;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.Position;
 import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.core.BptSlot.Mode;
 import net.minecraft.src.forge.ISpawnHandler;
 

common/net/minecraft/src/buildcraft/core/ITileBufferHolder.java

@@ -10,7 +10,7 @@
 package net.minecraft.src.buildcraft.core;
 
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public interface ITileBufferHolder {
 

common/net/minecraft/src/buildcraft/core/StackUtil.java

@@ -15,8 +15,8 @@ import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory;
 import net.minecraft.src.forge.ISidedInventory;
 

common/net/minecraft/src/buildcraft/core/SurroundingInventory.java

@@ -16,8 +16,8 @@ import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 
 public class SurroundingInventory implements IInventory, IBuilderInventory {
 

common/net/minecraft/src/buildcraft/core/TileBuffer.java

@@ -13,7 +13,7 @@ import net.minecraft.src.Block;
 import net.minecraft.src.BlockContainer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 
 public class TileBuffer {
 

common/net/minecraft/src/buildcraft/core/TriggerLiquidContainer.java

@@ -10,7 +10,7 @@
 package net.minecraft.src.buildcraft.core;
 
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
 import net.minecraft.src.buildcraft.api.gates.ITriggerParameter;
 import net.minecraft.src.buildcraft.api.gates.Trigger;
 import net.minecraft.src.buildcraft.api.liquids.ILiquidTank;

common/net/minecraft/src/buildcraft/core/Utils.java

@@ -25,10 +25,10 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntityChest;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.IAreaProvider;
-import net.minecraft.src.buildcraft.api.LaserKind;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.IAreaProvider;
+import net.minecraft.src.buildcraft.api.core.LaserKind;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.liquids.ILiquid;
 import net.minecraft.src.buildcraft.api.transport.IPipeConnection;
 import net.minecraft.src.buildcraft.api.transport.IPipeEntry;

common/net/minecraft/src/buildcraft/core/network/PacketPipeTransportContent.java

@@ -1,6 +1,6 @@
 package net.minecraft.src.buildcraft.core.network;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.transport.IPipedItem;
 
 public class PacketPipeTransportContent extends PacketUpdate {

common/net/minecraft/src/buildcraft/core/utils/SidedInventoryAdapter.java

@@ -3,7 +3,7 @@ package net.minecraft.src.buildcraft.core.utils;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.forge.ISidedInventory;
 
 /**

common/net/minecraft/src/buildcraft/energy/BlockEngine.java

@@ -22,7 +22,7 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.mod_BuildCraftEnergy;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.tools.IToolWrench;
 import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.buildcraft.core.IItemPipe;

common/net/minecraft/src/buildcraft/energy/BptBlockEngine.java

@@ -11,11 +11,11 @@ package net.minecraft.src.buildcraft.energy;
 
 import net.minecraft.src.Block;
 import net.minecraft.src.mod_BuildCraftEnergy;
-import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.blueprints.BlockSignature;
 import net.minecraft.src.buildcraft.api.blueprints.BptBlock;
 import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo;
 import net.minecraft.src.buildcraft.api.blueprints.IBptContext;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public class BptBlockEngine extends BptBlock {
 

common/net/minecraft/src/buildcraft/energy/Engine.java

@@ -13,7 +13,7 @@ import net.minecraft.src.ICrafting;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.liquids.LiquidTank;
 import net.minecraft.src.buildcraft.core.network.TileNetworkData;
 

common/net/minecraft/src/buildcraft/energy/EngineIron.java

@@ -13,8 +13,8 @@ import net.minecraft.src.Block;
 import net.minecraft.src.ICrafting;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.fuels.IronEngineCoolant;
 import net.minecraft.src.buildcraft.api.fuels.IronEngineFuel;
 import net.minecraft.src.buildcraft.api.liquids.LiquidManager;

common/net/minecraft/src/buildcraft/energy/TileEngine.java

@@ -20,8 +20,8 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.Packet;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.gates.IOverrideDefaultTriggers;
 import net.minecraft.src.buildcraft.api.gates.ITrigger;
 import net.minecraft.src.buildcraft.api.gates.Trigger;

common/net/minecraft/src/buildcraft/energy/TilePollution.java

@@ -11,7 +11,7 @@ package net.minecraft.src.buildcraft.energy;
 
 import net.minecraft.src.BuildCraftEnergy;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 import net.minecraft.src.buildcraft.core.BlockIndex;
 
 public class TilePollution extends TileEntity {

common/net/minecraft/src/buildcraft/factory/BlockMiningWell.java

@@ -16,8 +16,8 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;

common/net/minecraft/src/buildcraft/factory/BlockQuarry.java

@@ -18,8 +18,8 @@ import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.core.Box;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;

common/net/minecraft/src/buildcraft/factory/BlockRefinery.java

@@ -22,9 +22,9 @@ import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.mod_BuildCraftFactory;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.liquids.LiquidManager;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
 import net.minecraft.src.buildcraft.api.tools.IToolWrench;

common/net/minecraft/src/buildcraft/factory/BlockTank.java

@@ -19,10 +19,10 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.liquids.LiquidManager;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
-import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ITextureProvider;

common/net/minecraft/src/buildcraft/factory/BptBlockRefinery.java

@@ -8,10 +8,10 @@
 
 package net.minecraft.src.buildcraft.factory;
 
-import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.blueprints.BptBlock;
 import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo;
 import net.minecraft.src.buildcraft.api.blueprints.IBptContext;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public class BptBlockRefinery extends BptBlock {
 

common/net/minecraft/src/buildcraft/factory/TileAssemblyTable.java

@@ -12,7 +12,7 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.NBTTagList;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.mod_BuildCraftSilicon;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe;
 import net.minecraft.src.buildcraft.api.transport.IPipeConnection;
 import net.minecraft.src.buildcraft.core.CoreProxy;

common/net/minecraft/src/buildcraft/factory/TileAutoWorkbench.java

@@ -19,8 +19,8 @@ import net.minecraft.src.InventoryCrafting;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory;
 import net.minecraft.src.buildcraft.core.StackUtil;
 import net.minecraft.src.buildcraft.core.Utils;

common/net/minecraft/src/buildcraft/factory/TileHopper.java

@@ -6,7 +6,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory;
 import net.minecraft.src.buildcraft.core.TileBuildCraft;
 import net.minecraft.src.buildcraft.core.utils.InventoryUtil;

common/net/minecraft/src/buildcraft/factory/TileMiningWell.java

@@ -17,7 +17,7 @@ import net.minecraft.src.BuildCraftFactory;
 import net.minecraft.src.EntityItem;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.power.IPowerProvider;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
 import net.minecraft.src.buildcraft.api.power.PowerFramework;

common/net/minecraft/src/buildcraft/factory/TilePump.java

@@ -18,9 +18,9 @@ import net.minecraft.src.BuildCraftCore;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.liquids.ITankContainer;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
 import net.minecraft.src.buildcraft.api.power.IPowerProvider;

common/net/minecraft/src/buildcraft/factory/TileQuarry.java

@@ -21,10 +21,10 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.IAreaProvider;
-import net.minecraft.src.buildcraft.api.LaserKind;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.IAreaProvider;
+import net.minecraft.src.buildcraft.api.core.LaserKind;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.power.IPowerProvider;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
 import net.minecraft.src.buildcraft.api.power.PowerFramework;

common/net/minecraft/src/buildcraft/factory/TileRefinery.java

@@ -17,9 +17,9 @@ import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 import net.minecraft.src.buildcraft.api.liquids.ILiquidTank;
 import net.minecraft.src.buildcraft.api.liquids.ITankContainer;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;

common/net/minecraft/src/buildcraft/factory/TileTank.java

@@ -14,9 +14,9 @@ import net.minecraft.src.BuildCraftFactory;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 import net.minecraft.src.buildcraft.api.liquids.ILiquidTank;
 import net.minecraft.src.buildcraft.api.liquids.ITankContainer;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;

common/net/minecraft/src/buildcraft/silicon/BlockLaser.java

@@ -17,7 +17,7 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.ITextureProvider;
 

common/net/minecraft/src/buildcraft/silicon/TileLaser.java

@@ -14,9 +14,9 @@ import java.util.LinkedList;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 import net.minecraft.src.buildcraft.api.power.IPowerProvider;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
 import net.minecraft.src.buildcraft.api.power.PowerFramework;

common/net/minecraft/src/buildcraft/transport/BptItemPipeDiamond.java

@@ -13,10 +13,10 @@ import java.util.LinkedList;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo;
 import net.minecraft.src.buildcraft.api.blueprints.IBptContext;
 import net.minecraft.src.buildcraft.api.bptblocks.BptBlockUtils;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.core.BptItem;
 
 public class BptItemPipeDiamond extends BptItem {

common/net/minecraft/src/buildcraft/transport/BptItemPipeIron.java

@@ -12,9 +12,9 @@ package net.minecraft.src.buildcraft.transport;
 import java.util.LinkedList;
 
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo;
 import net.minecraft.src.buildcraft.api.blueprints.IBptContext;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.core.BptItem;
 
 public class BptItemPipeIron extends BptItem {

common/net/minecraft/src/buildcraft/transport/BptItemPipeWodden.java

@@ -12,9 +12,9 @@ package net.minecraft.src.buildcraft.transport;
 import java.util.LinkedList;
 
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.Orientations;
 import net.minecraft.src.buildcraft.api.blueprints.BptSlotInfo;
 import net.minecraft.src.buildcraft.api.blueprints.IBptContext;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.core.BptItem;
 
 public class BptItemPipeWodden extends BptItem {

common/net/minecraft/src/buildcraft/transport/CraftingGateInterface.java

@@ -19,9 +19,9 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.Slot;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.gates.Action;
 import net.minecraft.src.buildcraft.api.gates.ActionManager;
 import net.minecraft.src.buildcraft.api.gates.IAction;

common/net/minecraft/src/buildcraft/transport/EnergyPulser.java

@@ -1,7 +1,7 @@
 package net.minecraft.src.buildcraft.transport;
 
 import net.minecraft.src.NBTTagCompound;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.power.IPowerReceptor;
 
 public class EnergyPulser {

common/net/minecraft/src/buildcraft/transport/EntityData.java

@@ -1,6 +1,6 @@
 package net.minecraft.src.buildcraft.transport;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.transport.IPipedItem;
 
 public class EntityData {

common/net/minecraft/src/buildcraft/transport/IPipeTransportItemsHook.java

@@ -11,8 +11,8 @@ package net.minecraft.src.buildcraft.transport;
 
 import java.util.LinkedList;
 
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.Position;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.Position;
 import net.minecraft.src.buildcraft.api.transport.IPipedItem;
 
 public interface IPipeTransportItemsHook {

common/net/minecraft/src/buildcraft/transport/IPipeTransportLiquidsHook.java

@@ -9,7 +9,7 @@
 
 package net.minecraft.src.buildcraft.transport;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
 
 public interface IPipeTransportLiquidsHook {

common/net/minecraft/src/buildcraft/transport/IPipeTransportPowerHook.java

@@ -9,7 +9,7 @@
 
 package net.minecraft.src.buildcraft.transport;
 
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 
 public interface IPipeTransportPowerHook {
 

common/net/minecraft/src/buildcraft/transport/ItemFacade.java

@@ -14,7 +14,7 @@ import net.minecraft.src.ItemBlock;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe;
 import net.minecraft.src.buildcraft.core.ItemBuildCraft;
 

common/net/minecraft/src/buildcraft/transport/Pipe.java

@@ -23,9 +23,9 @@ import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.BuildCraftAPI;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 import net.minecraft.src.buildcraft.api.gates.Action;
 import net.minecraft.src.buildcraft.api.gates.ActionManager;
 import net.minecraft.src.buildcraft.api.gates.IAction;

common/net/minecraft/src/buildcraft/transport/PipeLogic.java

@@ -13,7 +13,7 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.core.IDropControlInventory;
 
 public class PipeLogic implements IDropControlInventory {

common/net/minecraft/src/buildcraft/transport/PipeLogicDiamond.java

@@ -16,8 +16,8 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
 import net.minecraft.src.mod_BuildCraftTransport;
 import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.Orientations;
-import net.minecraft.src.buildcraft.api.SafeTimeTracker;
+import net.minecraft.src.buildcraft.api.core.Orientations;
+import net.minecraft.src.buildcraft.api.core.SafeTimeTracker;
 import net.minecraft.src.buildcraft.api.inventory.ISpecialInventory;
 import net.minecraft.src.buildcraft.core.CoreProxy;
 import net.minecraft.src.buildcraft.core.DefaultProps;

common/net/minecraft/src/buildcraft/transport/PipeLogicIron.java

@@ -13,7 +13,7 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.Item;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.api.Orientations;
+import net.minecraft.src.buildcraft.api.core.Orientations;
 import net.minecraft.src.buildcraft.api.liquids.ITankContainer;
 import net.minecraft.src.buildcraft.api.tools.IToolWrench;
 import net.minecraft.src.buildcraft.api.transport.IPipeEntry;