Fixed namespace.

buildcraft_client/buildcraft/api/APIProxy.java

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

buildcraft_client/buildcraft/builders/BuildersProxy.java

@@ -7,8 +7,9 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
+import buildcraft.builders.TileBlueprintLibrary;
 import net.minecraft.src.Block;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.World;

buildcraft_client/buildcraft/builders/ClientBuilderHook.java

@@ -1,13 +1,15 @@
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
 import java.io.IOException;
 
-import net.minecraft.src.BuildCraftBuilders;
+import buildcraft.BuildCraftBuilders;
+import buildcraft.api.APIProxy;
+import buildcraft.builders.IBuilderHook;
+import buildcraft.core.BptPlayerIndex;
+import buildcraft.core.BptRootIndex;
+import buildcraft.core.CoreProxy;
+
 import net.minecraft.src.ModLoader;
-import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.core.BptPlayerIndex;
-import net.minecraft.src.buildcraft.core.BptRootIndex;
-import net.minecraft.src.buildcraft.core.CoreProxy;
 
 public class ClientBuilderHook implements IBuilderHook {
 

buildcraft_client/buildcraft/builders/CraftingTemplate.java

@@ -7,8 +7,10 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
+import buildcraft.builders.CraftingTemplateRoot;
+import buildcraft.builders.TileArchitect;
 import net.minecraft.src.ICrafting;
 import net.minecraft.src.IInventory;
 

buildcraft_client/buildcraft/builders/GuiBlueprintLibrary.java

@@ -7,20 +7,23 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
-import net.minecraft.src.BuildCraftBuilders;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.GuiButton;
 import net.minecraft.src.ModLoader;
-import net.minecraft.src.buildcraft.core.BptBase;
-import net.minecraft.src.buildcraft.core.BptPlayerIndex;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.GuiBuildCraft;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftBuilders;
+import buildcraft.builders.ContainerBlueprintLibrary;
+import buildcraft.builders.TileBlueprintLibrary;
+import buildcraft.core.BptBase;
+import buildcraft.core.BptPlayerIndex;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.utils.StringUtil;
+
 public class GuiBlueprintLibrary extends GuiBuildCraft {
 
 	EntityPlayer player;

buildcraft_client/buildcraft/builders/GuiBuilder.java

@@ -7,18 +7,21 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
 import java.util.Collection;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.GuiAdvancedInterface;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.builders.CraftingBuilder;
+import buildcraft.builders.TileBuilder;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.utils.StringUtil;
+
 public class GuiBuilder extends GuiAdvancedInterface {
 
 	IInventory playerInventory;

buildcraft_client/buildcraft/builders/GuiFiller.java

@@ -7,15 +7,18 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
 import net.minecraft.src.IInventory;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.GuiBuildCraft;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.builders.CraftingFiller;
+import buildcraft.builders.TileFiller;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.utils.StringUtil;
+
 public class GuiFiller extends GuiBuildCraft {
 
 	IInventory playerInventory;

buildcraft_client/buildcraft/builders/GuiHandler.java

@@ -1,9 +1,13 @@
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
+import buildcraft.builders.TileArchitect;
+import buildcraft.builders.TileBlueprintLibrary;
+import buildcraft.builders.TileBuilder;
+import buildcraft.builders.TileFiller;
+import buildcraft.core.GuiIds;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_client/buildcraft/builders/GuiTemplate.java

@@ -7,18 +7,20 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
 import java.util.Date;
 
-import net.minecraft.src.BuildCraftBuilders;
 import net.minecraft.src.IInventory;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.GuiBuildCraft;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftBuilders;
+import buildcraft.builders.TileArchitect;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.utils.StringUtil;
+
 public class GuiTemplate extends GuiBuildCraft {
 
 	IInventory playerInventory;

buildcraft_client/buildcraft/core/CoreProxy.java

@@ -7,11 +7,14 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.core;
+package buildcraft.core;
 
 import java.io.File;
 import java.util.Arrays;
 
+import buildcraft.core.ItemBlockBuildCraft;
+import buildcraft.core.network.BuildCraftPacket;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.src.Block;
 import net.minecraft.src.EntityItem;
@@ -24,7 +27,6 @@ import net.minecraft.src.ModLoader;
 import net.minecraft.src.Packet;
 import net.minecraft.src.StringTranslate;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.network.BuildCraftPacket;
 import net.minecraft.src.forge.MinecraftForgeClient;
 import net.minecraft.src.forge.NetworkMod;
 import cpw.mods.fml.client.SpriteHelper;
@@ -32,8 +34,6 @@ import cpw.mods.fml.common.FMLCommonHandler;
 
 public class CoreProxy {
 
-	private static boolean registeredOverrideTextureMap = false;
-
 	public static String getCurrentLanguage() {
 		return StringTranslate.getInstance().getCurrentLanguage();
 	}
@@ -51,11 +51,15 @@ public class CoreProxy {
 	public static void registerTileEntity(@SuppressWarnings("rawtypes") Class clas, String ident) {
 		ModLoader.registerTileEntity(clas, ident);
 	}
+	
+	public static void addCraftingRecipe(ItemStack result, Object[] recipe) {
+		ModLoader.addRecipe(result, recipe);
+	}
+	
+	public static void addShapelessRecipe(ItemStack result, Object[] recipe) {
+		ModLoader.addShapelessRecipe(result, recipe);
+	}
 
-	/*
-	 * public static void registerGUI(BaseModMp basemod, int id) {
-	 * ModLoaderMp.registerGUI(basemod, id); }
-	 */
 	public static void onCraftingPickup(World world, EntityPlayer player, ItemStack stack) {
 		stack.onCrafting(world, player, stack.stackSize);
 	}

buildcraft_client/buildcraft/core/GuiAdvancedInterface.java

@@ -1,4 +1,4 @@
-package net.minecraft.src.buildcraft.core;
+package buildcraft.core;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
@@ -7,6 +7,8 @@ import net.minecraft.src.RenderHelper;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.BuildCraftContainer;
+
 public abstract class GuiAdvancedInterface extends GuiBuildCraft {
 
 	public abstract class AdvancedSlot {

buildcraft_client/buildcraft/core/GuiBuildCraft.java

@@ -1,14 +1,17 @@
-package net.minecraft.src.buildcraft.core;
+package buildcraft.core;
 
 import java.util.ArrayList;
 
 import net.minecraft.src.GuiContainer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.core.utils.SessionVars;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.BuildCraftContainer;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.utils.SessionVars;
+
 public abstract class GuiBuildCraft extends GuiContainer {
 
 	// / LEDGERS

buildcraft_client/buildcraft/core/RenderEnergyLaser.java

@@ -7,8 +7,10 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.core;
+package buildcraft.core;
 
+import buildcraft.core.EntityEnergyLaser;
+import buildcraft.core.EntityLaser;
 import net.minecraft.src.ModelRenderer;
 
 public class RenderEnergyLaser extends RenderLaser {

buildcraft_client/buildcraft/core/RenderEntityBlock.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.core;
+package buildcraft.core;
 
 import net.minecraft.src.Block;
 import net.minecraft.src.Entity;
@@ -19,6 +19,9 @@ import net.minecraft.src.forge.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.DefaultProps;
+import buildcraft.core.EntityBlock;
+
 public class RenderEntityBlock extends Render {
 
 	public static class BlockInterface {

buildcraft_client/buildcraft/core/RenderLaser.java

@@ -1,4 +1,4 @@
-package net.minecraft.src.buildcraft.core;
+package buildcraft.core;
 
 import net.minecraft.src.Entity;
 import net.minecraft.src.ModelBase;
@@ -8,6 +8,8 @@ import net.minecraft.src.forge.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.EntityLaser;
+
 public class RenderLaser extends Render {
 
 	protected ModelBase model = new ModelBase() {};

buildcraft_client/buildcraft/core/RenderRobot.java

@@ -1,4 +1,4 @@
-package net.minecraft.src.buildcraft.core;
+package buildcraft.core;
 
 import net.minecraft.src.Entity;
 import net.minecraft.src.ModelBase;
@@ -8,6 +8,9 @@ import net.minecraft.src.forge.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.DefaultProps;
+import buildcraft.core.EntityRobot;
+
 public class RenderRobot extends Render {
 
 	protected ModelBase model = new ModelBase() {};

buildcraft_client/buildcraft/core/RenderVoid.java

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

buildcraft_client/buildcraft/core/TextureLiquidsFX.java

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

buildcraft_client/buildcraft/core/network/ConnectionHandler.java

@@ -1,8 +1,8 @@
-package net.minecraft.src.buildcraft.core.network;
+package buildcraft.core.network;
 
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.Packet1Login;
-import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.IConnectionHandler;
 import net.minecraft.src.forge.MessageManager;
 

buildcraft_client/buildcraft/core/network/PacketHandler.java

@@ -1,8 +1,12 @@
-package net.minecraft.src.buildcraft.core.network;
+package buildcraft.core.network;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 
+import buildcraft.core.network.ISynchronizedTile;
+import buildcraft.core.network.PacketIds;
+import buildcraft.core.network.PacketTileUpdate;
+
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.NetClientHandler;
 import net.minecraft.src.NetworkManager;

buildcraft_client/buildcraft/energy/ContainerEngine.java

@@ -7,8 +7,10 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
+import buildcraft.energy.ContainerEngineRoot;
+import buildcraft.energy.TileEngine;
 import net.minecraft.src.InventoryPlayer;
 
 public class ContainerEngine extends ContainerEngineRoot {

buildcraft_client/buildcraft/energy/GuiCombustionEngine.java

@@ -7,18 +7,21 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
 import net.minecraft.src.Block;
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.Item;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 import net.minecraft.src.forge.ITextureProvider;
 import net.minecraft.src.forge.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.DefaultProps;
+import buildcraft.core.utils.StringUtil;
+import buildcraft.energy.EngineIron;
+import buildcraft.energy.TileEngine;
+
 public class GuiCombustionEngine extends GuiEngine {
 
 	public GuiCombustionEngine(InventoryPlayer inventoryplayer, TileEngine tileEngine) {

buildcraft_client/buildcraft/energy/GuiEngine.java

@@ -1,10 +1,12 @@
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
+import buildcraft.core.BuildCraftContainer;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.utils.StringUtil;
+import buildcraft.energy.Engine;
+import buildcraft.energy.TileEngine;
 import net.minecraft.src.IInventory;
-import net.minecraft.src.buildcraft.core.BuildCraftContainer;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.GuiBuildCraft;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 public abstract class GuiEngine extends GuiBuildCraft {
 

buildcraft_client/buildcraft/energy/GuiHandler.java

@@ -1,9 +1,10 @@
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
+import buildcraft.core.GuiIds;
+import buildcraft.energy.TileEngine;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_client/buildcraft/energy/GuiSteamEngine.java

@@ -7,14 +7,16 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
 import net.minecraft.src.InventoryPlayer;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.DefaultProps;
+import buildcraft.core.utils.StringUtil;
+import buildcraft.energy.TileEngine;
+
 public class GuiSteamEngine extends GuiEngine {
 
 	public GuiSteamEngine(InventoryPlayer inventoryplayer, TileEngine tileEngine) {

buildcraft_client/buildcraft/energy/RenderEngine.java

@@ -7,22 +7,25 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
-import net.minecraft.src.BuildCraftCore;
-import net.minecraft.src.BuildCraftCore.RenderMode;
 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.core.Orientations;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.IInventoryRenderer;
-import net.minecraft.src.buildcraft.energy.Engine.EnergyStage;
 import net.minecraft.src.forge.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftCore;
+import buildcraft.BuildCraftCore.RenderMode;
+import buildcraft.api.core.Orientations;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.IInventoryRenderer;
+import buildcraft.energy.Engine;
+import buildcraft.energy.IEngineProvider;
+import buildcraft.energy.Engine.EnergyStage;
+
 public class RenderEngine extends TileEntitySpecialRenderer implements IInventoryRenderer {
 
 	private ModelBase model = new ModelBase() {};

buildcraft_client/buildcraft/energy/TextureFuelFX.java

@@ -7,10 +7,10 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
-import net.minecraft.src.BuildCraftEnergy;
-import net.minecraft.src.buildcraft.core.TextureLiquidsFX;
+import buildcraft.BuildCraftEnergy;
+import buildcraft.core.TextureLiquidsFX;
 import net.minecraft.src.forge.ITextureProvider;
 
 public class TextureFuelFX extends TextureLiquidsFX {

buildcraft_client/buildcraft/energy/TextureOilFX.java

@@ -7,10 +7,10 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
-import net.minecraft.src.BuildCraftEnergy;
-import net.minecraft.src.buildcraft.core.TextureLiquidsFX;
+import buildcraft.BuildCraftEnergy;
+import buildcraft.core.TextureLiquidsFX;
 import net.minecraft.src.forge.ITextureProvider;
 
 public class TextureOilFX extends TextureLiquidsFX {

buildcraft_client/buildcraft/energy/TextureOilFlowFX.java

@@ -7,14 +7,15 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
-import net.minecraft.src.BuildCraftEnergy;
 import net.minecraft.src.RenderEngine;
-import net.minecraft.src.buildcraft.core.DefaultProps;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftEnergy;
+import buildcraft.core.DefaultProps;
+
 import cpw.mods.fml.client.FMLTextureFX;
 
 public class TextureOilFlowFX extends FMLTextureFX {

buildcraft_client/buildcraft/factory/BlockMachineRoot.java

@@ -7,13 +7,13 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
+import buildcraft.core.IMachine;
 import net.minecraft.src.BlockContainer;
 import net.minecraft.src.IBlockAccess;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
-import net.minecraft.src.buildcraft.core.IMachine;
 
 public abstract class BlockMachineRoot extends BlockContainer {
 

buildcraft_client/buildcraft/factory/GuiAutoCrafting.java

@@ -7,15 +7,18 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiBuildCraft;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.utils.StringUtil;
+import buildcraft.factory.ContainerAutoWorkbench;
+import buildcraft.factory.TileAutoWorkbench;
+
 public class GuiAutoCrafting extends GuiBuildCraft {
 
 	public GuiAutoCrafting(InventoryPlayer inventoryplayer, World world, TileAutoWorkbench tile) {

buildcraft_client/buildcraft/factory/GuiHandler.java

@@ -1,9 +1,12 @@
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
+import buildcraft.core.GuiIds;
+import buildcraft.factory.TileAutoWorkbench;
+import buildcraft.factory.TileHopper;
+import buildcraft.factory.TileRefinery;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_client/buildcraft/factory/GuiHopper.java

@@ -1,11 +1,14 @@
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
 import net.minecraft.src.GuiContainer;
 import net.minecraft.src.InventoryPlayer;
-import net.minecraft.src.buildcraft.core.DefaultProps;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.DefaultProps;
+import buildcraft.factory.ContainerHopper;
+import buildcraft.factory.TileHopper;
+
 public class GuiHopper extends GuiContainer {
 
 	public GuiHopper(InventoryPlayer inventory, TileHopper tile) {

buildcraft_client/buildcraft/factory/GuiRefinery.java

@@ -7,20 +7,23 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.ItemStack;
-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;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.GuiAdvancedInterface;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.api.core.BuildCraftAPI;
+import buildcraft.api.liquids.LiquidManager;
+import buildcraft.api.liquids.LiquidStack;
+import buildcraft.api.recipes.RefineryRecipe;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.utils.StringUtil;
+import buildcraft.factory.ContainerRefinery;
+import buildcraft.factory.TileRefinery;
+
 public class GuiRefinery extends GuiAdvancedInterface {
 
 	ContainerRefinery container;

buildcraft_client/buildcraft/factory/ModelFrustum.java

@@ -1,4 +1,4 @@
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
 import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.PositionTextureVertex;

buildcraft_client/buildcraft/factory/RenderHopper.java

@@ -1,18 +1,19 @@
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
-import net.minecraft.src.BuildCraftCore;
-import net.minecraft.src.BuildCraftCore.RenderMode;
 import net.minecraft.src.ModelBase;
 import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.Tessellator;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.IInventoryRenderer;
 import net.minecraft.src.forge.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftCore;
+import buildcraft.BuildCraftCore.RenderMode;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.IInventoryRenderer;
+
 public class RenderHopper extends TileEntitySpecialRenderer implements IInventoryRenderer {
 
 	private ModelBase model = new ModelBase() {};

buildcraft_client/buildcraft/factory/RenderRefinery.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
 import java.util.HashMap;
 
@@ -19,15 +19,17 @@ import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.IInventoryRenderer;
-import net.minecraft.src.buildcraft.core.RenderEntityBlock;
-import net.minecraft.src.buildcraft.core.RenderEntityBlock.BlockInterface;
 import net.minecraft.src.forge.ITextureProvider;
 import net.minecraft.src.forge.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.DefaultProps;
+import buildcraft.core.IInventoryRenderer;
+import buildcraft.core.RenderEntityBlock;
+import buildcraft.core.RenderEntityBlock.BlockInterface;
+import buildcraft.factory.TileRefinery;
+
 public class RenderRefinery extends TileEntitySpecialRenderer implements IInventoryRenderer {
 
 	static final float factor = (float) (1.0 / 16.0);

buildcraft_client/buildcraft/factory/RenderTank.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
 import java.util.HashMap;
 
@@ -17,14 +17,16 @@ import net.minecraft.src.Item;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
-import net.minecraft.src.buildcraft.core.RenderEntityBlock;
-import net.minecraft.src.buildcraft.core.RenderEntityBlock.BlockInterface;
 import net.minecraft.src.forge.ITextureProvider;
 import net.minecraft.src.forge.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.api.liquids.LiquidStack;
+import buildcraft.core.RenderEntityBlock;
+import buildcraft.core.RenderEntityBlock.BlockInterface;
+import buildcraft.factory.TileTank;
+
 public class RenderTank extends TileEntitySpecialRenderer {
 
 	final static private int displayStages = 100;

buildcraft_client/buildcraft/factory/network/ConnectionHandler.java

@@ -1,8 +1,8 @@
-package net.minecraft.src.buildcraft.core.network;
+package buildcraft.factory.network;
 
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.Packet1Login;
-import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.IConnectionHandler;
 import net.minecraft.src.forge.MessageManager;
 

buildcraft_client/buildcraft/factory/network/PacketHandler.java

@@ -1,4 +1,4 @@
-package net.minecraft.src.buildcraft.core.network;
+package buildcraft.factory.network;
 
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.forge.IPacketHandler;

buildcraft_client/buildcraft/mod_BuildCraftBuilders.java

@@ -7,10 +7,11 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
-import net.minecraft.src.buildcraft.builders.ClientBuilderHook;
-import net.minecraft.src.buildcraft.core.DefaultProps;
+import buildcraft.BuildCraftBuilders;
+import buildcraft.builders.ClientBuilderHook;
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.NetworkMod;
 
 public class mod_BuildCraftBuilders extends NetworkMod {

buildcraft_client/buildcraft/mod_BuildCraftCore.java

@@ -7,31 +7,39 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.src.buildcraft.core.ClassMapping;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.EntityBlock;
-import net.minecraft.src.buildcraft.core.EntityEnergyLaser;
-import net.minecraft.src.buildcraft.core.EntityLaser;
-import net.minecraft.src.buildcraft.core.EntityRobot;
-import net.minecraft.src.buildcraft.core.IInventoryRenderer;
-import net.minecraft.src.buildcraft.core.RenderEnergyLaser;
-import net.minecraft.src.buildcraft.core.RenderEntityBlock;
-import net.minecraft.src.buildcraft.core.RenderLaser;
-import net.minecraft.src.buildcraft.core.RenderRobot;
-import net.minecraft.src.buildcraft.core.Utils;
-import net.minecraft.src.buildcraft.core.utils.Localization;
+import net.minecraft.src.Block;
+import net.minecraft.src.IBlockAccess;
+import net.minecraft.src.ModLoader;
+import net.minecraft.src.RenderBlocks;
+import net.minecraft.src.RenderItem;
+import net.minecraft.src.Tessellator;
 import net.minecraft.src.forge.MinecraftForgeClient;
 import net.minecraft.src.forge.NetworkMod;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftCore;
+import buildcraft.core.ClassMapping;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.EntityBlock;
+import buildcraft.core.EntityEnergyLaser;
+import buildcraft.core.EntityLaser;
+import buildcraft.core.EntityRobot;
+import buildcraft.core.IInventoryRenderer;
+import buildcraft.core.RenderEnergyLaser;
+import buildcraft.core.RenderEntityBlock;
+import buildcraft.core.RenderLaser;
+import buildcraft.core.RenderRobot;
+import buildcraft.core.Utils;
+import buildcraft.core.utils.Localization;
+
 public class mod_BuildCraftCore extends NetworkMod {
 
 	public static mod_BuildCraftCore instance;

buildcraft_client/buildcraft/mod_BuildCraftEnergy.java

@@ -7,17 +7,21 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
 import java.util.Random;
 
-import net.minecraft.src.mod_BuildCraftCore.EntityRenderIndex;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.energy.RenderEngine;
-import net.minecraft.src.buildcraft.energy.TextureFuelFX;
-import net.minecraft.src.buildcraft.energy.TextureOilFX;
-import net.minecraft.src.buildcraft.energy.TextureOilFlowFX;
-import net.minecraft.src.buildcraft.energy.TileEngine;
+import buildcraft.BuildCraftEnergy;
+import buildcraft.core.DefaultProps;
+import buildcraft.energy.RenderEngine;
+import buildcraft.energy.TextureFuelFX;
+import buildcraft.energy.TextureOilFX;
+import buildcraft.energy.TextureOilFlowFX;
+import buildcraft.energy.TileEngine;
+import buildcraft.mod_BuildCraftCore.EntityRenderIndex;
+
+import net.minecraft.src.ModLoader;
+import net.minecraft.src.World;
 import net.minecraft.src.forge.NetworkMod;
 
 public class mod_BuildCraftEnergy extends NetworkMod {
@@ -46,10 +50,6 @@ public class mod_BuildCraftEnergy extends NetworkMod {
 
 		ModLoader.registerTileEntity(TileEngine.class, "net.minecraft.src.buildcraft.energy.Engine", new RenderEngine());
 
-		// CoreProxy.registerGUI(this,
-		// Utils.packetIdToInt(PacketIds.EngineSteamGUI));
-		// CoreProxy.registerGUI(this,
-		// Utils.packetIdToInt(PacketIds.EngineCombustionGUI));
 	}
 
 	@Override

buildcraft_client/buildcraft/mod_BuildCraftFactory.java

@@ -7,22 +7,25 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import net.minecraft.src.mod_BuildCraftCore.EntityRenderIndex;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.RenderVoid;
-import net.minecraft.src.buildcraft.factory.EntityMechanicalArm;
-import net.minecraft.src.buildcraft.factory.GuiAutoCrafting;
-import net.minecraft.src.buildcraft.factory.RenderHopper;
-import net.minecraft.src.buildcraft.factory.RenderRefinery;
-import net.minecraft.src.buildcraft.factory.RenderTank;
-import net.minecraft.src.buildcraft.factory.TileHopper;
-import net.minecraft.src.buildcraft.factory.TileRefinery;
-import net.minecraft.src.buildcraft.factory.TileTank;
+import buildcraft.BuildCraftFactory;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.RenderVoid;
+import buildcraft.factory.EntityMechanicalArm;
+import buildcraft.factory.GuiAutoCrafting;
+import buildcraft.factory.RenderHopper;
+import buildcraft.factory.RenderRefinery;
+import buildcraft.factory.RenderTank;
+import buildcraft.factory.TileHopper;
+import buildcraft.factory.TileRefinery;
+import buildcraft.factory.TileTank;
+import buildcraft.mod_BuildCraftCore.EntityRenderIndex;
+
+import net.minecraft.src.ModLoader;
 import net.minecraft.src.forge.NetworkMod;
 
 public class mod_BuildCraftFactory extends NetworkMod {

buildcraft_client/buildcraft/mod_BuildCraftSilicon.java

@@ -7,15 +7,22 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
-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.Block;
+import net.minecraft.src.IBlockAccess;
+import net.minecraft.src.RenderBlocks;
+import net.minecraft.src.Tessellator;
 import net.minecraft.src.forge.NetworkMod;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftSilicon;
+import buildcraft.BuildCraftTransport;
+import buildcraft.api.core.Orientations;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.Utils;
+
 public class mod_BuildCraftSilicon extends NetworkMod {
 
 	public static mod_BuildCraftSilicon instance;

buildcraft_client/buildcraft/mod_BuildCraftTransport.java

@@ -7,15 +7,21 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.transport.FacadeItemRenderer;
-import net.minecraft.src.buildcraft.transport.IPipeRenderState;
-import net.minecraft.src.buildcraft.transport.PipeItemRenderer;
-import net.minecraft.src.buildcraft.transport.PipeWorldRenderer;
-import net.minecraft.src.buildcraft.transport.RenderPipe;
-import net.minecraft.src.buildcraft.transport.TileGenericPipe;
+import buildcraft.BuildCraftTransport;
+import buildcraft.core.DefaultProps;
+import buildcraft.transport.FacadeItemRenderer;
+import buildcraft.transport.IPipeRenderState;
+import buildcraft.transport.PipeItemRenderer;
+import buildcraft.transport.PipeWorldRenderer;
+import buildcraft.transport.RenderPipe;
+import buildcraft.transport.TileGenericPipe;
+import net.minecraft.src.Block;
+import net.minecraft.src.IBlockAccess;
+import net.minecraft.src.ModLoader;
+import net.minecraft.src.RenderBlocks;
+import net.minecraft.src.TileEntity;
 import net.minecraft.src.forge.MinecraftForgeClient;
 import net.minecraft.src.forge.NetworkMod;
 

buildcraft_client/buildcraft/silicon/GuiAssemblyTable.java

@@ -7,28 +7,30 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.silicon;
+package buildcraft.silicon;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe;
-import net.minecraft.src.buildcraft.core.CoreProxy;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.GuiAdvancedInterface;
-import net.minecraft.src.buildcraft.core.network.PacketCoordinates;
-import net.minecraft.src.buildcraft.core.network.PacketIds;
-import net.minecraft.src.buildcraft.core.network.PacketPayload;
-import net.minecraft.src.buildcraft.core.network.PacketUpdate;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
-import net.minecraft.src.buildcraft.factory.TileAssemblyTable;
-import net.minecraft.src.buildcraft.factory.TileAssemblyTable.SelectionMessage;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.api.APIProxy;
+import buildcraft.api.recipes.AssemblyRecipe;
+import buildcraft.core.CoreProxy;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.network.PacketCoordinates;
+import buildcraft.core.network.PacketIds;
+import buildcraft.core.network.PacketPayload;
+import buildcraft.core.network.PacketUpdate;
+import buildcraft.core.utils.StringUtil;
+import buildcraft.factory.TileAssemblyTable;
+import buildcraft.factory.TileAssemblyTable.SelectionMessage;
+import buildcraft.silicon.ContainerAssemblyTable;
+
 public class GuiAssemblyTable extends GuiAdvancedInterface {
 
 	TileAssemblyTable assemblyTable;

buildcraft_client/buildcraft/silicon/GuiHandler.java

@@ -1,10 +1,10 @@
-package net.minecraft.src.buildcraft.silicon;
+package buildcraft.silicon;
 
+import buildcraft.core.GuiIds;
+import buildcraft.factory.TileAssemblyTable;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
-import net.minecraft.src.buildcraft.factory.TileAssemblyTable;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_client/buildcraft/silicon/network/ConnectionHandler.java

@@ -1,8 +1,8 @@
-package net.minecraft.src.buildcraft.factory.network;
+package buildcraft.silicon.network;
 
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.Packet1Login;
-import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.IConnectionHandler;
 import net.minecraft.src.forge.MessageManager;
 

buildcraft_client/buildcraft/silicon/network/PacketHandler.java

@@ -1,17 +1,18 @@
-package net.minecraft.src.buildcraft.silicon.network;
+package buildcraft.silicon.network;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 
+import buildcraft.core.network.PacketIds;
+import buildcraft.core.network.PacketUpdate;
+import buildcraft.factory.TileAssemblyTable;
+import buildcraft.factory.TileAssemblyTable.SelectionMessage;
+import buildcraft.silicon.GuiAssemblyTable;
+
 import net.minecraft.src.GuiScreen;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.NetClientHandler;
 import net.minecraft.src.NetworkManager;
-import net.minecraft.src.buildcraft.core.network.PacketIds;
-import net.minecraft.src.buildcraft.core.network.PacketUpdate;
-import net.minecraft.src.buildcraft.factory.TileAssemblyTable;
-import net.minecraft.src.buildcraft.factory.TileAssemblyTable.SelectionMessage;
-import net.minecraft.src.buildcraft.silicon.GuiAssemblyTable;
 import net.minecraft.src.forge.IPacketHandler;
 
 public class PacketHandler implements IPacketHandler {

buildcraft_client/buildcraft/transport/FacadeItemRenderer.java

@@ -1,14 +1,16 @@
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftTransport;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.Utils;
+import buildcraft.transport.ItemFacade;
+
 import net.minecraft.src.Block;
-import net.minecraft.src.BuildCraftTransport;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.RenderBlocks;
 import net.minecraft.src.Tessellator;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.IItemRenderer;
 import net.minecraft.src.forge.MinecraftForgeClient;
 

buildcraft_client/buildcraft/transport/GuiDiamondPipe.java

@@ -7,20 +7,24 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.APIProxy;
-import net.minecraft.src.buildcraft.core.CoreProxy;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.GuiAdvancedInterface;
-import net.minecraft.src.buildcraft.core.network.PacketIds;
-import net.minecraft.src.buildcraft.core.network.PacketSlotChange;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.api.APIProxy;
+import buildcraft.core.CoreProxy;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.network.PacketIds;
+import buildcraft.core.network.PacketSlotChange;
+import buildcraft.core.utils.StringUtil;
+import buildcraft.transport.CraftingDiamondPipe;
+import buildcraft.transport.PipeLogicDiamond;
+import buildcraft.transport.TileGenericPipe;
+
 public class GuiDiamondPipe extends GuiAdvancedInterface {
 
 	IInventory playerInventory;

buildcraft_client/buildcraft/transport/GuiGateInterface.java

@@ -7,23 +7,26 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
 import java.util.Iterator;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
-import net.minecraft.src.buildcraft.api.gates.Action;
-import net.minecraft.src.buildcraft.api.gates.IAction;
-import net.minecraft.src.buildcraft.api.gates.ITrigger;
-import net.minecraft.src.buildcraft.api.gates.ITriggerParameter;
-import net.minecraft.src.buildcraft.api.gates.Trigger;
-import net.minecraft.src.buildcraft.core.GuiAdvancedInterface;
-import net.minecraft.src.buildcraft.core.utils.StringUtil;
-import net.minecraft.src.buildcraft.transport.Gate.GateKind;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.api.gates.Action;
+import buildcraft.api.gates.IAction;
+import buildcraft.api.gates.ITrigger;
+import buildcraft.api.gates.ITriggerParameter;
+import buildcraft.api.gates.Trigger;
+import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.utils.StringUtil;
+import buildcraft.transport.CraftingGateInterface;
+import buildcraft.transport.Pipe;
+import buildcraft.transport.Gate.GateKind;
+
 public class GuiGateInterface extends GuiAdvancedInterface {
 
 	IInventory playerInventory;

buildcraft_client/buildcraft/transport/GuiHandler.java

@@ -1,9 +1,10 @@
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
+import buildcraft.core.GuiIds;
+import buildcraft.transport.TileGenericPipe;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_client/buildcraft/transport/PipeItemRenderer.java

@@ -1,14 +1,16 @@
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftTransport;
+import buildcraft.core.Utils;
+import buildcraft.transport.ItemPipe;
+
 import net.minecraft.src.Block;
-import net.minecraft.src.BuildCraftTransport;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.RenderBlocks;
 import net.minecraft.src.Tessellator;
-import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.IItemRenderer;
 
 public class PipeItemRenderer implements IItemRenderer {

buildcraft_client/buildcraft/transport/PipeWorldRenderer.java

@@ -1,4 +1,4 @@
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
 
 import java.util.ArrayList;
@@ -7,17 +7,19 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.TreeMap;
 
+import buildcraft.api.core.Orientations;
+import buildcraft.api.transport.IPipe;
+import buildcraft.api.transport.IPipe.WireColor;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.Utils;
+import buildcraft.transport.PipeRenderState;
+
 import net.minecraft.src.Block;
 import net.minecraft.src.IBlockAccess;
 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.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;
-import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.MinecraftForgeClient;
 
 public class PipeWorldRenderer {

buildcraft_client/buildcraft/transport/RenderPipe.java

@@ -7,14 +7,12 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
 import java.util.HashMap;
 import java.util.Random;
 
 import net.minecraft.src.Block;
-import net.minecraft.src.BuildCraftCore;
-import net.minecraft.src.BuildCraftCore.RenderMode;
 import net.minecraft.src.EntityItem;
 import net.minecraft.src.GLAllocation;
 import net.minecraft.src.Item;
@@ -26,14 +24,6 @@ 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.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;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.RenderEntityBlock;
-import net.minecraft.src.buildcraft.core.RenderEntityBlock.BlockInterface;
-import net.minecraft.src.buildcraft.core.Utils;
 import net.minecraft.src.forge.ForgeHooksClient;
 import net.minecraft.src.forge.IItemRenderer;
 import net.minecraft.src.forge.IItemRenderer.ItemRenderType;
@@ -42,6 +32,23 @@ import net.minecraft.src.forge.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.BuildCraftCore;
+import buildcraft.BuildCraftCore.RenderMode;
+import buildcraft.api.core.Orientations;
+import buildcraft.api.liquids.ILiquidTank;
+import buildcraft.api.liquids.LiquidStack;
+import buildcraft.api.transport.IPipedItem;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.RenderEntityBlock;
+import buildcraft.core.Utils;
+import buildcraft.core.RenderEntityBlock.BlockInterface;
+import buildcraft.transport.EntityData;
+import buildcraft.transport.Pipe;
+import buildcraft.transport.PipeTransportItems;
+import buildcraft.transport.PipeTransportLiquids;
+import buildcraft.transport.PipeTransportPower;
+import buildcraft.transport.TileGenericPipe;
+
 public class RenderPipe extends TileEntitySpecialRenderer {
 
 	final static private int maxPower = 1000;

buildcraft_client/buildcraft/transport/TileEntityPickupFX.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
 import net.minecraft.src.Entity;
 import net.minecraft.src.EntityFX;
@@ -17,10 +17,11 @@ import net.minecraft.src.RenderManager;
 import net.minecraft.src.Tessellator;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.Utils;
 
 import org.lwjgl.opengl.GL11;
 
+import buildcraft.core.Utils;
+
 public class TileEntityPickupFX extends EntityFX {
 
 	private double yDestination;

buildcraft_client/buildcraft/transport/TransportProxy.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
 import net.minecraft.src.EntityItem;
 import net.minecraft.src.ModLoader;

buildcraft_client/buildcraft/transport/network/ConnectionHandler.java

@@ -1,8 +1,8 @@
-package net.minecraft.src.buildcraft.silicon.network;
+package buildcraft.transport.network;
 
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.Packet1Login;
-import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.IConnectionHandler;
 import net.minecraft.src.forge.MessageManager;
 

buildcraft_client/buildcraft/transport/network/PacketHandler.java

@@ -1,29 +1,33 @@
-package net.minecraft.src.buildcraft.transport.network;
+package buildcraft.transport.network;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 
-import net.minecraft.src.BuildCraftCore;
+import buildcraft.BuildCraftCore;
+import buildcraft.core.BlockIndex;
+import buildcraft.core.network.ISynchronizedTile;
+import buildcraft.core.network.PacketIds;
+import buildcraft.core.network.PacketNBT;
+import buildcraft.core.network.PacketPipeDescription;
+import buildcraft.core.network.PacketPipeTransportContent;
+import buildcraft.core.network.PacketUpdate;
+import buildcraft.transport.CraftingGateInterface;
+import buildcraft.transport.PipeLogicDiamond;
+import buildcraft.transport.PipeRenderState;
+import buildcraft.transport.PipeTransportItems;
+import buildcraft.transport.PipeTransportLiquids;
+import buildcraft.transport.PipeTransportPower;
+import buildcraft.transport.TileGenericPipe;
+import buildcraft.transport.network.PacketLiquidUpdate;
+import buildcraft.transport.network.PacketPowerUpdate;
+import buildcraft.transport.network.PipeRenderStatePacket;
+
 import net.minecraft.src.Container;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.NetClientHandler;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.BlockIndex;
-import net.minecraft.src.buildcraft.core.network.ISynchronizedTile;
-import net.minecraft.src.buildcraft.core.network.PacketIds;
-import net.minecraft.src.buildcraft.core.network.PacketNBT;
-import net.minecraft.src.buildcraft.core.network.PacketPipeDescription;
-import net.minecraft.src.buildcraft.core.network.PacketPipeTransportContent;
-import net.minecraft.src.buildcraft.core.network.PacketUpdate;
-import net.minecraft.src.buildcraft.transport.CraftingGateInterface;
-import net.minecraft.src.buildcraft.transport.PipeLogicDiamond;
-import net.minecraft.src.buildcraft.transport.PipeRenderState;
-import net.minecraft.src.buildcraft.transport.PipeTransportItems;
-import net.minecraft.src.buildcraft.transport.PipeTransportLiquids;
-import net.minecraft.src.buildcraft.transport.PipeTransportPower;
-import net.minecraft.src.buildcraft.transport.TileGenericPipe;
 import net.minecraft.src.forge.IPacketHandler;
 
 public class PacketHandler implements IPacketHandler {

buildcraft_client/net/minecraft/src/buildcraft/transport/network/ConnectionHandler.java

@@ -1,22 +0,0 @@
-package net.minecraft.src.buildcraft.transport.network;
-
-import net.minecraft.src.NetworkManager;
-import net.minecraft.src.Packet1Login;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.forge.IConnectionHandler;
-import net.minecraft.src.forge.MessageManager;
-
-public class ConnectionHandler implements IConnectionHandler {
-
-	@Override
-	public void onConnect(NetworkManager network) {
-		MessageManager.getInstance().registerChannel(network, new PacketHandler(), DefaultProps.NET_CHANNEL_NAME);
-	}
-
-	@Override
-	public void onLogin(NetworkManager network, Packet1Login login) {}
-
-	@Override
-	public void onDisconnect(NetworkManager network, String message, Object[] args) {}
-
-}

buildcraft_server/buildcraft/api/APIProxy.java

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

buildcraft_server/buildcraft/builders/BuildersProxy.java

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

buildcraft_server/buildcraft/builders/CraftingTemplate.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
 import net.minecraft.src.ICrafting;
 import net.minecraft.src.IInventory;

buildcraft_server/buildcraft/builders/GuiHandler.java

@@ -1,9 +1,9 @@
-package net.minecraft.src.buildcraft.builders;
+package buildcraft.builders;
 
+import buildcraft.core.GuiIds;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_server/buildcraft/core/CoreProxy.java

@@ -7,10 +7,12 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.core;
+package buildcraft.core;
 
 import java.io.File;
 
+import buildcraft.core.network.BuildCraftPacket;
+
 import net.minecraft.src.Block;
 import net.minecraft.src.EntityItem;
 import net.minecraft.src.EntityPlayer;
@@ -22,7 +24,6 @@ import net.minecraft.src.ItemStack;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.Packet;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.network.BuildCraftPacket;
 import net.minecraft.src.forge.NetworkMod;
 
 public class CoreProxy {
@@ -50,6 +51,14 @@ public class CoreProxy {
 	public static void onCraftingPickup(World world, EntityPlayer player, ItemStack stack) {
 		stack.onCrafting(world, player, stack.stackSize);
 	}
+	
+	public static void addCraftingRecipe(ItemStack result, Object[] recipe) {
+		ModLoader.addRecipe(result, recipe);
+	}
+	
+	public static void addShapelessRecipe(ItemStack result, Object[] recipe) {
+		ModLoader.addShapelessRecipe(result, recipe);
+	}
 
 	public static File getPropertyFile() {
 		return new File("BuildCraft.cfg");

buildcraft_server/buildcraft/core/network/ConnectionHandler.java

@@ -0,0 +1,22 @@
+package buildcraft.core.network;
+
+import buildcraft.core.DefaultProps;
+import net.minecraft.src.NetworkManager;
+import net.minecraft.src.Packet1Login;
+import net.minecraft.src.forge.IConnectionHandler;
+import net.minecraft.src.forge.MessageManager;
+
+public class ConnectionHandler implements IConnectionHandler {
+
+	@Override
+	public void onConnect(NetworkManager network) {
+		MessageManager.getInstance().registerChannel(network, new PacketHandler(), DefaultProps.NET_CHANNEL_NAME);
+	}
+
+	@Override
+	public void onLogin(NetworkManager network, Packet1Login login) {}
+
+	@Override
+	public void onDisconnect(NetworkManager network, String message, Object[] args) {}
+
+}

buildcraft_server/buildcraft/core/network/PacketHandler.java

@@ -1,4 +1,4 @@
-package net.minecraft.src.buildcraft.factory.network;
+package buildcraft.core.network;
 
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.forge.IPacketHandler;

buildcraft_server/buildcraft/energy/ContainerEngine.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
 import net.minecraft.src.ICrafting;
 import net.minecraft.src.InventoryPlayer;

buildcraft_server/buildcraft/energy/GuiHandler.java

@@ -1,9 +1,9 @@
-package net.minecraft.src.buildcraft.energy;
+package buildcraft.energy;
 
+import buildcraft.core.GuiIds;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_server/buildcraft/factory/BlockMachineRoot.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
 import net.minecraft.src.BlockContainer;
 import net.minecraft.src.Material;

buildcraft_server/buildcraft/factory/GuiHandler.java

@@ -1,9 +1,9 @@
-package net.minecraft.src.buildcraft.factory;
+package buildcraft.factory;
 
+import buildcraft.core.GuiIds;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_server/buildcraft/factory/network/ConnectionHandler.java

@@ -0,0 +1,22 @@
+package buildcraft.factory.network;
+
+import buildcraft.core.DefaultProps;
+import net.minecraft.src.NetworkManager;
+import net.minecraft.src.Packet1Login;
+import net.minecraft.src.forge.IConnectionHandler;
+import net.minecraft.src.forge.MessageManager;
+
+public class ConnectionHandler implements IConnectionHandler {
+
+	@Override
+	public void onConnect(NetworkManager network) {
+		MessageManager.getInstance().registerChannel(network, new PacketHandler(), DefaultProps.NET_CHANNEL_NAME);
+	}
+
+	@Override
+	public void onLogin(NetworkManager network, Packet1Login login) {}
+
+	@Override
+	public void onDisconnect(NetworkManager network, String message, Object[] args) {}
+
+}

buildcraft_server/buildcraft/factory/network/PacketHandler.java

@@ -1,16 +1,17 @@
-package net.minecraft.src.buildcraft.factory.network;
+package buildcraft.factory.network;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 
+import buildcraft.core.network.PacketIds;
+import buildcraft.core.network.PacketUpdate;
+import buildcraft.factory.TileRefinery;
+
 import net.minecraft.src.EntityPlayerMP;
 import net.minecraft.src.NetServerHandler;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.network.PacketIds;
-import net.minecraft.src.buildcraft.core.network.PacketUpdate;
-import net.minecraft.src.buildcraft.factory.TileRefinery;
 import net.minecraft.src.forge.IPacketHandler;
 
 public class PacketHandler implements IPacketHandler {

buildcraft_server/buildcraft/mod_BuildCraftBuilders.java

@@ -7,9 +7,9 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
-import net.minecraft.src.buildcraft.core.DefaultProps;
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.NetworkMod;
 
 public class mod_BuildCraftBuilders extends NetworkMod {

buildcraft_server/buildcraft/mod_BuildCraftCore.java

@@ -7,13 +7,15 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
 import java.util.Date;
 
+import buildcraft.core.ClassMapping;
+import buildcraft.core.DefaultProps;
+
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.src.buildcraft.core.ClassMapping;
-import net.minecraft.src.buildcraft.core.DefaultProps;
+import net.minecraft.src.ModLoader;
 import net.minecraft.src.forge.NetworkMod;
 
 public class mod_BuildCraftCore extends NetworkMod {

buildcraft_server/buildcraft/mod_BuildCraftEnergy.java

@@ -7,12 +7,15 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
 import java.util.Random;
 
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.energy.TileEngine;
+import buildcraft.core.DefaultProps;
+import buildcraft.energy.TileEngine;
+
+import net.minecraft.src.ModLoader;
+import net.minecraft.src.World;
 import net.minecraft.src.forge.NetworkMod;
 
 public class mod_BuildCraftEnergy extends NetworkMod {

buildcraft_server/buildcraft/mod_BuildCraftFactory.java

@@ -7,9 +7,9 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
-import net.minecraft.src.buildcraft.core.DefaultProps;
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.NetworkMod;
 
 public class mod_BuildCraftFactory extends NetworkMod {

buildcraft_server/buildcraft/mod_BuildCraftSilicon.java

@@ -7,9 +7,9 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
-import net.minecraft.src.buildcraft.core.DefaultProps;
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.NetworkMod;
 
 public class mod_BuildCraftSilicon extends NetworkMod {

buildcraft_server/buildcraft/mod_BuildCraftTransport.java

@@ -7,9 +7,11 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
-import net.minecraft.src.buildcraft.core.DefaultProps;
+import buildcraft.core.DefaultProps;
+import net.minecraft.src.ModLoader;
+import net.minecraft.src.TileEntity;
 import net.minecraft.src.forge.NetworkMod;
 
 public class mod_BuildCraftTransport extends NetworkMod {

buildcraft_server/buildcraft/silicon/GuiHandler.java

@@ -1,10 +1,10 @@
-package net.minecraft.src.buildcraft.silicon;
+package buildcraft.silicon;
 
+import buildcraft.core.GuiIds;
+import buildcraft.factory.TileAssemblyTable;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
-import net.minecraft.src.buildcraft.factory.TileAssemblyTable;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_server/buildcraft/silicon/network/ConnectionHandler.java

@@ -1,8 +1,8 @@
-package net.minecraft.src.buildcraft.silicon.network;
+package buildcraft.silicon.network;
 
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.Packet1Login;
-import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.IConnectionHandler;
 import net.minecraft.src.forge.MessageManager;
 

buildcraft_server/buildcraft/silicon/network/PacketHandler.java

@@ -1,17 +1,18 @@
-package net.minecraft.src.buildcraft.silicon.network;
+package buildcraft.silicon.network;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 
+import buildcraft.core.network.PacketCoordinates;
+import buildcraft.core.network.PacketIds;
+import buildcraft.core.network.PacketUpdate;
+import buildcraft.factory.TileAssemblyTable;
+
 import net.minecraft.src.EntityPlayerMP;
 import net.minecraft.src.NetServerHandler;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.network.PacketCoordinates;
-import net.minecraft.src.buildcraft.core.network.PacketIds;
-import net.minecraft.src.buildcraft.core.network.PacketUpdate;
-import net.minecraft.src.buildcraft.factory.TileAssemblyTable;
 import net.minecraft.src.forge.IPacketHandler;
 
 public class PacketHandler implements IPacketHandler {

buildcraft_server/buildcraft/transport/GuiHandler.java

@@ -1,9 +1,9 @@
-package net.minecraft.src.buildcraft.transport;
+package buildcraft.transport;
 
+import buildcraft.core.GuiIds;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.GuiIds;
 import net.minecraft.src.forge.IGuiHandler;
 
 public class GuiHandler implements IGuiHandler {

buildcraft_server/buildcraft/transport/TransportProxy.java

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

buildcraft_server/buildcraft/transport/network/ConnectionHandler.java

@@ -1,8 +1,8 @@
-package net.minecraft.src.buildcraft.transport.network;
+package buildcraft.transport.network;
 
+import buildcraft.core.DefaultProps;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.Packet1Login;
-import net.minecraft.src.buildcraft.core.DefaultProps;
 import net.minecraft.src.forge.IConnectionHandler;
 import net.minecraft.src.forge.MessageManager;
 

buildcraft_server/buildcraft/transport/network/PacketHandler.java

@@ -1,20 +1,21 @@
-package net.minecraft.src.buildcraft.transport.network;
+package buildcraft.transport.network;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 
+import buildcraft.core.network.PacketCoordinates;
+import buildcraft.core.network.PacketIds;
+import buildcraft.core.network.PacketSlotChange;
+import buildcraft.core.network.PacketUpdate;
+import buildcraft.transport.CraftingGateInterface;
+import buildcraft.transport.PipeLogicDiamond;
+import buildcraft.transport.TileGenericPipe;
+
 import net.minecraft.src.EntityPlayerMP;
 import net.minecraft.src.NetServerHandler;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;
-import net.minecraft.src.buildcraft.core.network.PacketCoordinates;
-import net.minecraft.src.buildcraft.core.network.PacketIds;
-import net.minecraft.src.buildcraft.core.network.PacketSlotChange;
-import net.minecraft.src.buildcraft.core.network.PacketUpdate;
-import net.minecraft.src.buildcraft.transport.CraftingGateInterface;
-import net.minecraft.src.buildcraft.transport.PipeLogicDiamond;
-import net.minecraft.src.buildcraft.transport.TileGenericPipe;
 import net.minecraft.src.forge.IPacketHandler;
 
 public class PacketHandler implements IPacketHandler {

buildcraft_server/net/minecraft/src/buildcraft/factory/network/ConnectionHandler.java

@@ -1,22 +0,0 @@
-package net.minecraft.src.buildcraft.factory.network;
-
-import net.minecraft.src.NetworkManager;
-import net.minecraft.src.Packet1Login;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.forge.IConnectionHandler;
-import net.minecraft.src.forge.MessageManager;
-
-public class ConnectionHandler implements IConnectionHandler {
-
-	@Override
-	public void onConnect(NetworkManager network) {
-		MessageManager.getInstance().registerChannel(network, new PacketHandler(), DefaultProps.NET_CHANNEL_NAME);
-	}
-
-	@Override
-	public void onLogin(NetworkManager network, Packet1Login login) {}
-
-	@Override
-	public void onDisconnect(NetworkManager network, String message, Object[] args) {}
-
-}

common/buildcraft/BuildCraftBlockUtil.java

@@ -6,18 +6,16 @@
  * granted by the copyright holder.
  */
 
-package net.minecraft.src;
+package buildcraft;
 
 import java.util.ArrayList;
 
+import net.minecraft.src.Block;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.World;
+
 public class BuildCraftBlockUtil {
 
-	public static int damageDropped(World world, int i, int j, int k) {
-		Block block = Block.blocksList[world.getBlockId(i, j, k)];
-
-		return block.damageDropped(world.getBlockMetadata(i, j, k));
-	}
-
 	public static ArrayList<ItemStack> getItemStackFromBlock(World world, int i, int j, int k) {
 		Block block = Block.blocksList[world.getBlockId(i, j, k)];
 

common/buildcraft/BuildCraftBuilders.java

@@ -7,61 +7,70 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src;
+package buildcraft;
 
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.TreeMap;
 
-import net.minecraft.src.buildcraft.api.blueprints.BptBlock;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockBed;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockCustomStack;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockDelegate;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockDirt;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockDoor;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockIgnore;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockIgnoreMeta;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockInventory;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockLever;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockLiquid;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockPiston;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockPumpkin;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockRedstoneRepeater;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockRotateInventory;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockRotateMeta;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockSign;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockStairs;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockWallSide;
-import net.minecraft.src.buildcraft.api.filler.FillerManager;
-import net.minecraft.src.buildcraft.builders.BlockArchitect;
-import net.minecraft.src.buildcraft.builders.BlockBlueprintLibrary;
-import net.minecraft.src.buildcraft.builders.BlockBuilder;
-import net.minecraft.src.buildcraft.builders.BlockFiller;
-import net.minecraft.src.buildcraft.builders.BlockMarker;
-import net.minecraft.src.buildcraft.builders.BlockPathMarker;
-import net.minecraft.src.buildcraft.builders.BptBlockFiller;
-import net.minecraft.src.buildcraft.builders.BuildersSaveManager;
-import net.minecraft.src.buildcraft.builders.FillerFillAll;
-import net.minecraft.src.buildcraft.builders.FillerFillPyramid;
-import net.minecraft.src.buildcraft.builders.FillerFillStairs;
-import net.minecraft.src.buildcraft.builders.FillerFillWalls;
-import net.minecraft.src.buildcraft.builders.FillerFlattener;
-import net.minecraft.src.buildcraft.builders.FillerRegistry;
-import net.minecraft.src.buildcraft.builders.FillerRemover;
-import net.minecraft.src.buildcraft.builders.GuiHandler;
-import net.minecraft.src.buildcraft.builders.IBuilderHook;
-import net.minecraft.src.buildcraft.builders.ItemBptBluePrint;
-import net.minecraft.src.buildcraft.builders.ItemBptTemplate;
-import net.minecraft.src.buildcraft.builders.TileArchitect;
-import net.minecraft.src.buildcraft.builders.TileBlueprintLibrary;
-import net.minecraft.src.buildcraft.builders.TileBuilder;
-import net.minecraft.src.buildcraft.builders.TileFiller;
-import net.minecraft.src.buildcraft.builders.TileMarker;
-import net.minecraft.src.buildcraft.builders.TilePathMarker;
-import net.minecraft.src.buildcraft.core.BptPlayerIndex;
-import net.minecraft.src.buildcraft.core.BptRootIndex;
-import net.minecraft.src.buildcraft.core.CoreProxy;
-import net.minecraft.src.buildcraft.core.DefaultProps;
+import cpw.mods.fml.common.FMLCommonHandler;
+
+import buildcraft.mod_BuildCraftBuilders;
+import buildcraft.mod_BuildCraftCore;
+import buildcraft.api.blueprints.BptBlock;
+import buildcraft.api.bptblocks.BptBlockBed;
+import buildcraft.api.bptblocks.BptBlockCustomStack;
+import buildcraft.api.bptblocks.BptBlockDelegate;
+import buildcraft.api.bptblocks.BptBlockDirt;
+import buildcraft.api.bptblocks.BptBlockDoor;
+import buildcraft.api.bptblocks.BptBlockIgnore;
+import buildcraft.api.bptblocks.BptBlockIgnoreMeta;
+import buildcraft.api.bptblocks.BptBlockInventory;
+import buildcraft.api.bptblocks.BptBlockLever;
+import buildcraft.api.bptblocks.BptBlockLiquid;
+import buildcraft.api.bptblocks.BptBlockPiston;
+import buildcraft.api.bptblocks.BptBlockPumpkin;
+import buildcraft.api.bptblocks.BptBlockRedstoneRepeater;
+import buildcraft.api.bptblocks.BptBlockRotateInventory;
+import buildcraft.api.bptblocks.BptBlockRotateMeta;
+import buildcraft.api.bptblocks.BptBlockSign;
+import buildcraft.api.bptblocks.BptBlockStairs;
+import buildcraft.api.bptblocks.BptBlockWallSide;
+import buildcraft.api.filler.FillerManager;
+import buildcraft.builders.BlockArchitect;
+import buildcraft.builders.BlockBlueprintLibrary;
+import buildcraft.builders.BlockBuilder;
+import buildcraft.builders.BlockFiller;
+import buildcraft.builders.BlockMarker;
+import buildcraft.builders.BlockPathMarker;
+import buildcraft.builders.BptBlockFiller;
+import buildcraft.builders.BuildersSaveManager;
+import buildcraft.builders.FillerFillAll;
+import buildcraft.builders.FillerFillPyramid;
+import buildcraft.builders.FillerFillStairs;
+import buildcraft.builders.FillerFillWalls;
+import buildcraft.builders.FillerFlattener;
+import buildcraft.builders.FillerRegistry;
+import buildcraft.builders.FillerRemover;
+import buildcraft.builders.GuiHandler;
+import buildcraft.builders.IBuilderHook;
+import buildcraft.builders.ItemBptBluePrint;
+import buildcraft.builders.ItemBptTemplate;
+import buildcraft.builders.TileArchitect;
+import buildcraft.builders.TileBlueprintLibrary;
+import buildcraft.builders.TileBuilder;
+import buildcraft.builders.TileFiller;
+import buildcraft.builders.TileMarker;
+import buildcraft.builders.TilePathMarker;
+import buildcraft.core.BptPlayerIndex;
+import buildcraft.core.BptRootIndex;
+import buildcraft.core.CoreProxy;
+import buildcraft.core.DefaultProps;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.CraftingManager;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
 import net.minecraft.src.forge.Configuration;
 import net.minecraft.src.forge.MinecraftForge;
 import net.minecraft.src.forge.Property;
@@ -291,36 +300,35 @@ public class BuildCraftBuilders {
 	}
 
 	public static void loadRecipes() {
-		CraftingManager craftingmanager = CraftingManager.getInstance();
 
-		craftingmanager.addRecipe(new ItemStack(templateItem, 1), new Object[] { "ppp", "pip", "ppp", Character.valueOf('i'),
+		CoreProxy.addCraftingRecipe(new ItemStack(templateItem, 1), new Object[] { "ppp", "pip", "ppp", Character.valueOf('i'),
 				new ItemStack(Item.dyePowder, 1, 0), Character.valueOf('p'), Item.paper });
 
-		craftingmanager.addRecipe(new ItemStack(blueprintItem, 1), new Object[] { "ppp", "pip", "ppp", Character.valueOf('i'),
+		CoreProxy.addCraftingRecipe(new ItemStack(blueprintItem, 1), new Object[] { "ppp", "pip", "ppp", Character.valueOf('i'),
 				new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('p'), Item.paper });
 
-		craftingmanager.addRecipe(new ItemStack(markerBlock, 1), new Object[] { "l ", "r ", Character.valueOf('l'),
+		CoreProxy.addCraftingRecipe(new ItemStack(markerBlock, 1), new Object[] { "l ", "r ", Character.valueOf('l'),
 				new ItemStack(Item.dyePowder, 1, 4), Character.valueOf('r'), Block.torchRedstoneActive });
 
-		craftingmanager.addRecipe(new ItemStack(pathMarkerBlock, 1), new Object[] { "l ", "r ", Character.valueOf('l'),
+		CoreProxy.addCraftingRecipe(new ItemStack(pathMarkerBlock, 1), new Object[] { "l ", "r ", Character.valueOf('l'),
 				new ItemStack(Item.dyePowder, 1, 2), Character.valueOf('r'), Block.torchRedstoneActive });
 
-		craftingmanager.addRecipe(new ItemStack(fillerBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
+		CoreProxy.addCraftingRecipe(new ItemStack(fillerBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
 				new ItemStack(Item.dyePowder, 1, 0), Character.valueOf('t'), markerBlock, Character.valueOf('y'),
 				new ItemStack(Item.dyePowder, 1, 11), Character.valueOf('c'), Block.workbench, Character.valueOf('g'),
 				BuildCraftCore.goldGearItem, Character.valueOf('C'), Block.chest });
 
-		craftingmanager.addRecipe(new ItemStack(builderBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
+		CoreProxy.addCraftingRecipe(new ItemStack(builderBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
 				new ItemStack(Item.dyePowder, 1, 0), Character.valueOf('t'), markerBlock, Character.valueOf('y'),
 				new ItemStack(Item.dyePowder, 1, 11), Character.valueOf('c'), Block.workbench, Character.valueOf('g'),
 				BuildCraftCore.diamondGearItem, Character.valueOf('C'), Block.chest });
 
-		craftingmanager.addRecipe(new ItemStack(architectBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
+		CoreProxy.addCraftingRecipe(new ItemStack(architectBlock, 1), new Object[] { "btb", "ycy", "gCg", Character.valueOf('b'),
 				new ItemStack(Item.dyePowder, 1, 0), Character.valueOf('t'), markerBlock, Character.valueOf('y'),
 				new ItemStack(Item.dyePowder, 1, 11), Character.valueOf('c'), Block.workbench, Character.valueOf('g'),
 				BuildCraftCore.diamondGearItem, Character.valueOf('C'), new ItemStack(templateItem, 1) });
 
-		craftingmanager.addRecipe(new ItemStack(libraryBlock, 1), new Object[] { "bbb", "bBb", "bbb", Character.valueOf('b'),
+		CoreProxy.addCraftingRecipe(new ItemStack(libraryBlock, 1), new Object[] { "bbb", "bBb", "bbb", Character.valueOf('b'),
 				new ItemStack(blueprintItem), Character.valueOf('B'), Block.bookShelf });
 	}
 

common/buildcraft/BuildCraftCore.java

@@ -1,303 +1,310 @@
-/**
- * BuildCraft is open-source. It is distributed under the terms of the
- * BuildCraft Open Source License. It grants rights to read, modify, compile
- * or run the code. It does *NOT* grant the right to redistribute this software
- * or its modifications in any form, binary or source, except if expressively
- * granted by the copyright holder.
- */
-
-package net.minecraft.src;
-
-import java.io.File;
-import java.util.TreeMap;
-
-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;
-import net.minecraft.src.buildcraft.api.liquids.LiquidData;
-import net.minecraft.src.buildcraft.api.liquids.LiquidManager;
-import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
-import net.minecraft.src.buildcraft.api.power.PowerFramework;
-import net.minecraft.src.buildcraft.core.ActionMachineControl;
-import net.minecraft.src.buildcraft.core.ActionMachineControl.Mode;
-import net.minecraft.src.buildcraft.core.ActionRedstoneOutput;
-import net.minecraft.src.buildcraft.core.BlockIndex;
-import net.minecraft.src.buildcraft.core.BptItem;
-import net.minecraft.src.buildcraft.core.BuildCraftConfiguration;
-import net.minecraft.src.buildcraft.core.CoreProxy;
-import net.minecraft.src.buildcraft.core.DefaultActionProvider;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.DefaultTriggerProvider;
-import net.minecraft.src.buildcraft.core.ItemBuildCraft;
-import net.minecraft.src.buildcraft.core.ItemWrench;
-import net.minecraft.src.buildcraft.core.RedstonePowerFramework;
-import net.minecraft.src.buildcraft.core.TriggerInventory;
-import net.minecraft.src.buildcraft.core.TriggerLiquidContainer;
-import net.minecraft.src.buildcraft.core.TriggerMachine;
-import net.minecraft.src.buildcraft.core.network.ConnectionHandler;
-import net.minecraft.src.buildcraft.core.network.PacketUpdate;
-import net.minecraft.src.buildcraft.transport.TriggerRedstoneInput;
-import net.minecraft.src.forge.Configuration;
-import net.minecraft.src.forge.MinecraftForge;
-import net.minecraft.src.forge.Property;
-
-public class BuildCraftCore {
-
-	public static enum RenderMode {
-		Full, NoDynamic
-	};
-
-	public static RenderMode render = RenderMode.Full;
-
-	public static boolean debugMode = false;
-	public static boolean modifyWorld = false;
-	public static boolean trackNetworkUsage = false;
-
-	public static boolean dropBrokenBlocks = true; // Set to false to prevent
-													// the filler from dropping
-													// broken blocks.
-
-	public static int updateFactor = 10;
-
-	public static BuildCraftConfiguration mainConfiguration;
-
-	public static TreeMap<BlockIndex, PacketUpdate> bufferedDescriptions = new TreeMap<BlockIndex, PacketUpdate>();
-
-	public static final int trackedPassiveEntityId = 156;
-
-	public static boolean continuousCurrentModel;
-
-	private static boolean initialized = false;
-	private static boolean gearsInitialized = false;
-
-	public static Item woodenGearItem;
-	public static Item stoneGearItem;
-	public static Item ironGearItem;
-	public static Item goldGearItem;
-	public static Item diamondGearItem;
-	public static Item wrenchItem;
-
-	public static int redLaserTexture;
-	public static int blueLaserTexture;
-	public static int stripesLaserTexture;
-	public static int transparentTexture;
-
-	public static int blockByEntityModel;
-	public static int legacyPipeModel;
-	public static int markerModel;
-	public static int oilModel;
-
-	public static Trigger triggerMachineActive = new TriggerMachine(DefaultProps.TRIGGER_MACHINE_ACTIVE, true);
-	public static Trigger triggerMachineInactive = new TriggerMachine(DefaultProps.TRIGGER_MACHINE_INACTIVE, false);
-	public static Trigger triggerEmptyInventory = new TriggerInventory(DefaultProps.TRIGGER_EMPTY_INVENTORY,
-			TriggerInventory.State.Empty);
-	public static Trigger triggerContainsInventory = new TriggerInventory(DefaultProps.TRIGGER_CONTAINS_INVENTORY,
-			TriggerInventory.State.Contains);
-	public static Trigger triggerSpaceInventory = new TriggerInventory(DefaultProps.TRIGGER_SPACE_INVENTORY,
-			TriggerInventory.State.Space);
-	public static Trigger triggerFullInventory = new TriggerInventory(DefaultProps.TRIGGER_FULL_INVENTORY,
-			TriggerInventory.State.Full);
-	public static Trigger triggerEmptyLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_EMPTY_LIQUID,
-			TriggerLiquidContainer.State.Empty);
-	public static Trigger triggerContainsLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_CONTAINS_LIQUID,
-			TriggerLiquidContainer.State.Contains);
-	public static Trigger triggerSpaceLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_SPACE_LIQUID,
-			TriggerLiquidContainer.State.Space);
-	public static Trigger triggerFullLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_FULL_LIQUID,
-			TriggerLiquidContainer.State.Full);
-	public static Trigger triggerRedstoneActive = new TriggerRedstoneInput(DefaultProps.TRIGGER_REDSTONE_ACTIVE, true);
-	public static Trigger triggerRedstoneInactive = new TriggerRedstoneInput(DefaultProps.TRIGGER_REDSTONE_INACTIVE, false);
-
-	public static Action actionRedstone = new ActionRedstoneOutput(DefaultProps.ACTION_REDSTONE);
-	public static Action actionOn = new ActionMachineControl(DefaultProps.ACTION_ON, Mode.On);
-	public static Action actionOff = new ActionMachineControl(DefaultProps.ACTION_OFF, Mode.Off);
-	public static Action actionLoop = new ActionMachineControl(DefaultProps.ACTION_LOOP, Mode.Loop);
-
-	public static boolean loadDefaultRecipes = true;
-	public static boolean forcePneumaticPower = false;
-	public static boolean consumeWaterSources = true;
-
-	public static BptItem[] itemBptProps = new BptItem[Item.itemsList.length];
-
-	public static void load() {
-
-		MinecraftForge.registerConnectionHandler(new ConnectionHandler());
-	}
-
-	public static void initialize() {
-		if (initialized)
-			return;
-
-		ModLoader.getLogger().fine("Starting BuildCraft " + mod_BuildCraftCore.version());
-		ModLoader.getLogger().fine("Copyright (c) SpaceToad, 2011");
-		ModLoader.getLogger().fine("http://www.mod-buildcraft.com");
-
-		System.out.println("Starting BuildCraft " + mod_BuildCraftCore.version());
-		System.out.println("Copyright (c) SpaceToad, 2011-2012");
-		System.out.println("http://www.mod-buildcraft.com");
-
-		initialized = true;
-
-		mainConfiguration = new BuildCraftConfiguration(new File(CoreProxy.getBuildCraftBase(), "config/buildcraft.cfg"), true);
-		mainConfiguration.load();
-
-		redLaserTexture = 0 * 16 + 2;
-		blueLaserTexture = 0 * 16 + 1;
-		stripesLaserTexture = 0 * 16 + 3;
-		transparentTexture = 0 * 16 + 0;
-
-		Property continuousCurrent = BuildCraftCore.mainConfiguration.getOrCreateBooleanProperty("current.continuous",
-				Configuration.CATEGORY_GENERAL, DefaultProps.CURRENT_CONTINUOUS);
-		continuousCurrent.comment = "set to true for allowing machines to be driven by continuous current";
-
-		continuousCurrentModel = Boolean.parseBoolean(continuousCurrent.value);
-
-		Property trackNetwork = BuildCraftCore.mainConfiguration.getOrCreateBooleanProperty("trackNetworkUsage",
-				Configuration.CATEGORY_GENERAL, false);
-
-		trackNetworkUsage = Boolean.parseBoolean(trackNetwork.value);
-
-		Property dropBlock = BuildCraftCore.mainConfiguration.getOrCreateBooleanProperty("dropBrokenBlocks",
-				Configuration.CATEGORY_GENERAL, true);
-		dropBlock.comment = "set to false to prevent fillers from dropping blocks.";
-		dropBrokenBlocks = Boolean.parseBoolean(dropBlock.value);
-
-		Property powerFrameworkClass = BuildCraftCore.mainConfiguration.getOrCreateProperty("power.framework",
-				Configuration.CATEGORY_GENERAL, "buildcraft.energy.PneumaticPowerFramework");
-
-		Property factor = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("network.updateFactor",
-				Configuration.CATEGORY_GENERAL, 10);
-		factor.comment = "increasing this number will decrease network update frequency, useful for overloaded servers";
-
-		updateFactor = Integer.parseInt(factor.value);
-
-		String prefix = "";
-
-		if (BuildCraftCore.class.getName().startsWith("net.minecraft.src."))
-			prefix = "net.minecraft.src.";
-
-		if (forcePneumaticPower)
-			try {
-				PowerFramework.currentFramework = (PowerFramework) Class
-						.forName(prefix + "buildcraft.energy.PneumaticPowerFramework").getConstructor().newInstance();
-			} catch (Throwable e) {
-				e.printStackTrace();
-			}
-		else
-			try {
-				String className = powerFrameworkClass.value;
-				if (className.startsWith("net.minecraft.src."))
-					className = className.replace("net.minecraft.src.", "");
-
-				PowerFramework.currentFramework = (PowerFramework) Class.forName(prefix + className).getConstructor()
-						.newInstance();
-			} catch (Throwable e) {
-				e.printStackTrace();
-				PowerFramework.currentFramework = new RedstonePowerFramework();
-			}
-
-		Property wrenchId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("wrench.id", Configuration.CATEGORY_ITEM,
-				DefaultProps.WRENCH_ID);
-
-		mainConfiguration.save();
-
-		initializeGears();
-
-		wrenchItem = (new ItemWrench(Integer.parseInt(wrenchId.value))).setIconIndex(0 * 16 + 2).setItemName("wrenchItem");
-		CoreProxy.addName(wrenchItem, "Wrench");
-
-		LiquidManager.liquids.add(new LiquidData(new LiquidStack(Block.waterStill, BuildCraftAPI.BUCKET_VOLUME), new LiquidStack(Block.waterMoving, BuildCraftAPI.BUCKET_VOLUME), new ItemStack(Item.bucketWater), new ItemStack(Item.bucketEmpty)));
-		LiquidManager.liquids.add(new LiquidData(new LiquidStack(Block.lavaStill, BuildCraftAPI.BUCKET_VOLUME), new LiquidStack(Block.lavaMoving, BuildCraftAPI.BUCKET_VOLUME), new ItemStack(Item.bucketLava), new ItemStack(Item.bucketEmpty)));
-
-		BuildCraftAPI.softBlocks[Block.tallGrass.blockID] = true;
-		BuildCraftAPI.softBlocks[Block.snow.blockID] = true;
-		BuildCraftAPI.softBlocks[Block.waterMoving.blockID] = true;
-		BuildCraftAPI.softBlocks[Block.waterStill.blockID] = true;
-
-		mainConfiguration.save();
-
-		if (BuildCraftCore.loadDefaultRecipes)
-			loadRecipes();
-	}
-
-	public static void loadRecipes() {
-		CraftingManager craftingmanager = CraftingManager.getInstance();
-
-		craftingmanager.addRecipe(new ItemStack(wrenchItem), new Object[] { "I I", " G ", " I ", Character.valueOf('I'),
-				Item.ingotIron, Character.valueOf('G'), stoneGearItem });
-
-		craftingmanager.addRecipe(new ItemStack(woodenGearItem), new Object[] { " S ", "S S", " S ", Character.valueOf('S'),
-				Item.stick });
-
-		craftingmanager.addRecipe(new ItemStack(stoneGearItem), new Object[] { " I ", "IGI", " I ", Character.valueOf('I'),
-				Block.cobblestone, Character.valueOf('G'), woodenGearItem });
-
-		craftingmanager.addRecipe(new ItemStack(ironGearItem), new Object[] { " I ", "IGI", " I ", Character.valueOf('I'),
-				Item.ingotIron, Character.valueOf('G'), stoneGearItem });
-
-		craftingmanager.addRecipe(new ItemStack(goldGearItem), new Object[] { " I ", "IGI", " I ", Character.valueOf('I'),
-				Item.ingotGold, Character.valueOf('G'), ironGearItem });
-
-		craftingmanager.addRecipe(new ItemStack(diamondGearItem), new Object[] { " I ", "IGI", " I ", Character.valueOf('I'),
-				Item.diamond, Character.valueOf('G'), goldGearItem });
-	}
-
-	public static void initializeGears() {
-		if (gearsInitialized)
-			return;
-
-		Property woodenGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("woodenGearItem.id",
-				Configuration.CATEGORY_ITEM, DefaultProps.WOODEN_GEAR_ID);
-		Property stoneGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("stoneGearItem.id",
-				Configuration.CATEGORY_ITEM, DefaultProps.STONE_GEAR_ID);
-		Property ironGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("ironGearItem.id",
-				Configuration.CATEGORY_ITEM, DefaultProps.IRON_GEAR_ID);
-		Property goldenGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("goldenGearItem.id",
-				Configuration.CATEGORY_ITEM, DefaultProps.GOLDEN_GEAR_ID);
-		Property diamondGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("diamondGearItem.id",
-				Configuration.CATEGORY_ITEM, DefaultProps.DIAMOND_GEAR_ID);
-		Property modifyWorld = BuildCraftCore.mainConfiguration.getOrCreateBooleanProperty("modifyWorld",
-				Configuration.CATEGORY_GENERAL, true);
-		modifyWorld.comment = "set to false if BuildCraft should not generate custom blocks (e.g. oil)";
-
-		BuildCraftCore.mainConfiguration.save();
-
-		BuildCraftCore.modifyWorld = modifyWorld.value.equals("true");
-
-		gearsInitialized = true;
-
-		woodenGearItem = (new ItemBuildCraft(Integer.parseInt(woodenGearId.value))).setIconIndex(1 * 16 + 0).setItemName(
-				"woodenGearItem");
-		CoreProxy.addName(woodenGearItem, "Wooden Gear");
-
-		stoneGearItem = (new ItemBuildCraft(Integer.parseInt(stoneGearId.value))).setIconIndex(1 * 16 + 1).setItemName(
-				"stoneGearItem");
-		CoreProxy.addName(stoneGearItem, "Stone Gear");
-
-		ironGearItem = (new ItemBuildCraft(Integer.parseInt(ironGearId.value))).setIconIndex(1 * 16 + 2).setItemName(
-				"ironGearItem");
-		CoreProxy.addName(ironGearItem, "Iron Gear");
-
-		goldGearItem = (new ItemBuildCraft(Integer.parseInt(goldenGearId.value))).setIconIndex(1 * 16 + 3).setItemName(
-				"goldGearItem");
-		CoreProxy.addName(goldGearItem, "Gold Gear");
-
-		diamondGearItem = (new ItemBuildCraft(Integer.parseInt(diamondGearId.value))).setIconIndex(1 * 16 + 4).setItemName(
-				"diamondGearItem");
-		CoreProxy.addName(diamondGearItem, "Diamond Gear");
-
-		BuildCraftCore.mainConfiguration.save();
-
-		ActionManager.registerTriggerProvider(new DefaultTriggerProvider());
-		ActionManager.registerActionProvider(new DefaultActionProvider());
-	}
-
-	public static void initializeModel(BaseMod mod) {
-		blockByEntityModel = ModLoader.getUniqueBlockModelID(mod, true);
-		legacyPipeModel = ModLoader.getUniqueBlockModelID(mod, true);
-		markerModel = ModLoader.getUniqueBlockModelID(mod, false);
-		oilModel = ModLoader.getUniqueBlockModelID(mod, false);
-	}
-
-}
+/**
+ * BuildCraft is open-source. It is distributed under the terms of the
+ * BuildCraft Open Source License. It grants rights to read, modify, compile
+ * or run the code. It does *NOT* grant the right to redistribute this software
+ * or its modifications in any form, binary or source, except if expressively
+ * granted by the copyright holder.
+ */
+
+package buildcraft;
+
+import java.io.File;
+import java.util.TreeMap;
+
+import buildcraft.mod_BuildCraftCore;
+import buildcraft.api.core.BuildCraftAPI;
+import buildcraft.api.gates.Action;
+import buildcraft.api.gates.ActionManager;
+import buildcraft.api.gates.Trigger;
+import buildcraft.api.liquids.LiquidData;
+import buildcraft.api.liquids.LiquidManager;
+import buildcraft.api.liquids.LiquidStack;
+import buildcraft.api.power.PowerFramework;
+import buildcraft.core.ActionMachineControl;
+import buildcraft.core.ActionRedstoneOutput;
+import buildcraft.core.BlockIndex;
+import buildcraft.core.BptItem;
+import buildcraft.core.BuildCraftConfiguration;
+import buildcraft.core.CoreProxy;
+import buildcraft.core.DefaultActionProvider;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.DefaultTriggerProvider;
+import buildcraft.core.ItemBuildCraft;
+import buildcraft.core.ItemWrench;
+import buildcraft.core.RedstonePowerFramework;
+import buildcraft.core.TriggerInventory;
+import buildcraft.core.TriggerLiquidContainer;
+import buildcraft.core.TriggerMachine;
+import buildcraft.core.ActionMachineControl.Mode;
+import buildcraft.core.network.ConnectionHandler;
+import buildcraft.core.network.PacketUpdate;
+import buildcraft.transport.TriggerRedstoneInput;
+
+import net.minecraft.src.BaseMod;
+import net.minecraft.src.Block;
+import net.minecraft.src.CraftingManager;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.ModLoader;
+import net.minecraft.src.forge.Configuration;
+import net.minecraft.src.forge.MinecraftForge;
+import net.minecraft.src.forge.Property;
+
+public class BuildCraftCore {
+
+	public static enum RenderMode {
+		Full, NoDynamic
+	};
+
+	public static RenderMode render = RenderMode.Full;
+
+	public static boolean debugMode = false;
+	public static boolean modifyWorld = false;
+	public static boolean trackNetworkUsage = false;
+
+	public static boolean dropBrokenBlocks = true; // Set to false to prevent
+													// the filler from dropping
+													// broken blocks.
+
+	public static int updateFactor = 10;
+
+	public static BuildCraftConfiguration mainConfiguration;
+
+	public static TreeMap<BlockIndex, PacketUpdate> bufferedDescriptions = new TreeMap<BlockIndex, PacketUpdate>();
+
+	public static final int trackedPassiveEntityId = 156;
+
+	public static boolean continuousCurrentModel;
+
+	private static boolean initialized = false;
+	private static boolean gearsInitialized = false;
+
+	public static Item woodenGearItem;
+	public static Item stoneGearItem;
+	public static Item ironGearItem;
+	public static Item goldGearItem;
+	public static Item diamondGearItem;
+	public static Item wrenchItem;
+
+	public static int redLaserTexture;
+	public static int blueLaserTexture;
+	public static int stripesLaserTexture;
+	public static int transparentTexture;
+
+	public static int blockByEntityModel;
+	public static int legacyPipeModel;
+	public static int markerModel;
+	public static int oilModel;
+
+	public static Trigger triggerMachineActive = new TriggerMachine(DefaultProps.TRIGGER_MACHINE_ACTIVE, true);
+	public static Trigger triggerMachineInactive = new TriggerMachine(DefaultProps.TRIGGER_MACHINE_INACTIVE, false);
+	public static Trigger triggerEmptyInventory = new TriggerInventory(DefaultProps.TRIGGER_EMPTY_INVENTORY,
+			TriggerInventory.State.Empty);
+	public static Trigger triggerContainsInventory = new TriggerInventory(DefaultProps.TRIGGER_CONTAINS_INVENTORY,
+			TriggerInventory.State.Contains);
+	public static Trigger triggerSpaceInventory = new TriggerInventory(DefaultProps.TRIGGER_SPACE_INVENTORY,
+			TriggerInventory.State.Space);
+	public static Trigger triggerFullInventory = new TriggerInventory(DefaultProps.TRIGGER_FULL_INVENTORY,
+			TriggerInventory.State.Full);
+	public static Trigger triggerEmptyLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_EMPTY_LIQUID,
+			TriggerLiquidContainer.State.Empty);
+	public static Trigger triggerContainsLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_CONTAINS_LIQUID,
+			TriggerLiquidContainer.State.Contains);
+	public static Trigger triggerSpaceLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_SPACE_LIQUID,
+			TriggerLiquidContainer.State.Space);
+	public static Trigger triggerFullLiquid = new TriggerLiquidContainer(DefaultProps.TRIGGER_FULL_LIQUID,
+			TriggerLiquidContainer.State.Full);
+	public static Trigger triggerRedstoneActive = new TriggerRedstoneInput(DefaultProps.TRIGGER_REDSTONE_ACTIVE, true);
+	public static Trigger triggerRedstoneInactive = new TriggerRedstoneInput(DefaultProps.TRIGGER_REDSTONE_INACTIVE, false);
+
+	public static Action actionRedstone = new ActionRedstoneOutput(DefaultProps.ACTION_REDSTONE);
+	public static Action actionOn = new ActionMachineControl(DefaultProps.ACTION_ON, Mode.On);
+	public static Action actionOff = new ActionMachineControl(DefaultProps.ACTION_OFF, Mode.Off);
+	public static Action actionLoop = new ActionMachineControl(DefaultProps.ACTION_LOOP, Mode.Loop);
+
+	public static boolean loadDefaultRecipes = true;
+	public static boolean forcePneumaticPower = false;
+	public static boolean consumeWaterSources = true;
+
+	public static BptItem[] itemBptProps = new BptItem[Item.itemsList.length];
+
+	public static void load() {
+
+		MinecraftForge.registerConnectionHandler(new ConnectionHandler());
+	}
+
+	public static void initialize() {
+		if (initialized)
+			return;
+
+		ModLoader.getLogger().fine("Starting BuildCraft " + mod_BuildCraftCore.version());
+		ModLoader.getLogger().fine("Copyright (c) SpaceToad, 2011");
+		ModLoader.getLogger().fine("http://www.mod-buildcraft.com");
+
+		System.out.println("Starting BuildCraft " + mod_BuildCraftCore.version());
+		System.out.println("Copyright (c) SpaceToad, 2011-2012");
+		System.out.println("http://www.mod-buildcraft.com");
+
+		initialized = true;
+
+		mainConfiguration = new BuildCraftConfiguration(new File(CoreProxy.getBuildCraftBase(), "config/buildcraft.cfg"), true);
+		mainConfiguration.load();
+
+		redLaserTexture = 0 * 16 + 2;
+		blueLaserTexture = 0 * 16 + 1;
+		stripesLaserTexture = 0 * 16 + 3;
+		transparentTexture = 0 * 16 + 0;
+
+		Property continuousCurrent = BuildCraftCore.mainConfiguration.getOrCreateBooleanProperty("current.continuous",
+				Configuration.CATEGORY_GENERAL, DefaultProps.CURRENT_CONTINUOUS);
+		continuousCurrent.comment = "set to true for allowing machines to be driven by continuous current";
+
+		continuousCurrentModel = Boolean.parseBoolean(continuousCurrent.value);
+
+		Property trackNetwork = BuildCraftCore.mainConfiguration.getOrCreateBooleanProperty("trackNetworkUsage",
+				Configuration.CATEGORY_GENERAL, false);
+
+		trackNetworkUsage = Boolean.parseBoolean(trackNetwork.value);
+
+		Property dropBlock = BuildCraftCore.mainConfiguration.getOrCreateBooleanProperty("dropBrokenBlocks",
+				Configuration.CATEGORY_GENERAL, true);
+		dropBlock.comment = "set to false to prevent fillers from dropping blocks.";
+		dropBrokenBlocks = Boolean.parseBoolean(dropBlock.value);
+
+		Property powerFrameworkClass = BuildCraftCore.mainConfiguration.getOrCreateProperty("power.framework",
+				Configuration.CATEGORY_GENERAL, "buildcraft.energy.PneumaticPowerFramework");
+
+		Property factor = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("network.updateFactor",
+				Configuration.CATEGORY_GENERAL, 10);
+		factor.comment = "increasing this number will decrease network update frequency, useful for overloaded servers";
+
+		updateFactor = Integer.parseInt(factor.value);
+
+		String prefix = "";
+
+		if (BuildCraftCore.class.getName().startsWith("net.minecraft.src."))
+			prefix = "net.minecraft.src.";
+
+		if (forcePneumaticPower)
+			try {
+				PowerFramework.currentFramework = (PowerFramework) Class
+						.forName(prefix + "buildcraft.energy.PneumaticPowerFramework").getConstructor().newInstance();
+			} catch (Throwable e) {
+				e.printStackTrace();
+			}
+		else
+			try {
+				String className = powerFrameworkClass.value;
+				if (className.startsWith("net.minecraft.src."))
+					className = className.replace("net.minecraft.src.", "");
+
+				PowerFramework.currentFramework = (PowerFramework) Class.forName(prefix + className).getConstructor()
+						.newInstance();
+			} catch (Throwable e) {
+				e.printStackTrace();
+				PowerFramework.currentFramework = new RedstonePowerFramework();
+			}
+
+		Property wrenchId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("wrench.id", Configuration.CATEGORY_ITEM,
+				DefaultProps.WRENCH_ID);
+
+		mainConfiguration.save();
+
+		initializeGears();
+
+		wrenchItem = (new ItemWrench(Integer.parseInt(wrenchId.value))).setIconIndex(0 * 16 + 2).setItemName("wrenchItem");
+		CoreProxy.addName(wrenchItem, "Wrench");
+
+		LiquidManager.liquids.add(new LiquidData(new LiquidStack(Block.waterStill, BuildCraftAPI.BUCKET_VOLUME), new LiquidStack(Block.waterMoving, BuildCraftAPI.BUCKET_VOLUME), new ItemStack(Item.bucketWater), new ItemStack(Item.bucketEmpty)));
+		LiquidManager.liquids.add(new LiquidData(new LiquidStack(Block.lavaStill, BuildCraftAPI.BUCKET_VOLUME), new LiquidStack(Block.lavaMoving, BuildCraftAPI.BUCKET_VOLUME), new ItemStack(Item.bucketLava), new ItemStack(Item.bucketEmpty)));
+
+		BuildCraftAPI.softBlocks[Block.tallGrass.blockID] = true;
+		BuildCraftAPI.softBlocks[Block.snow.blockID] = true;
+		BuildCraftAPI.softBlocks[Block.waterMoving.blockID] = true;
+		BuildCraftAPI.softBlocks[Block.waterStill.blockID] = true;
+
+		mainConfiguration.save();
+
+		if (BuildCraftCore.loadDefaultRecipes)
+			loadRecipes();
+	}
+
+	public static void loadRecipes() {
+
+		CoreProxy.addCraftingRecipe(new ItemStack(wrenchItem), new Object[] { "I I", " G ", " I ", Character.valueOf('I'),
+				Item.ingotIron, Character.valueOf('G'), stoneGearItem });
+
+		CoreProxy.addCraftingRecipe(new ItemStack(woodenGearItem), new Object[] { " S ", "S S", " S ", Character.valueOf('S'),
+				Item.stick });
+
+		CoreProxy.addCraftingRecipe(new ItemStack(stoneGearItem), new Object[] { " I ", "IGI", " I ", Character.valueOf('I'),
+				Block.cobblestone, Character.valueOf('G'), woodenGearItem });
+
+		CoreProxy.addCraftingRecipe(new ItemStack(ironGearItem), new Object[] { " I ", "IGI", " I ", Character.valueOf('I'),
+				Item.ingotIron, Character.valueOf('G'), stoneGearItem });
+
+		CoreProxy.addCraftingRecipe(new ItemStack(goldGearItem), new Object[] { " I ", "IGI", " I ", Character.valueOf('I'),
+				Item.ingotGold, Character.valueOf('G'), ironGearItem });
+
+		CoreProxy.addCraftingRecipe(new ItemStack(diamondGearItem), new Object[] { " I ", "IGI", " I ", Character.valueOf('I'),
+				Item.diamond, Character.valueOf('G'), goldGearItem });
+	}
+
+	public static void initializeGears() {
+		if (gearsInitialized)
+			return;
+
+		Property woodenGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("woodenGearItem.id",
+				Configuration.CATEGORY_ITEM, DefaultProps.WOODEN_GEAR_ID);
+		Property stoneGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("stoneGearItem.id",
+				Configuration.CATEGORY_ITEM, DefaultProps.STONE_GEAR_ID);
+		Property ironGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("ironGearItem.id",
+				Configuration.CATEGORY_ITEM, DefaultProps.IRON_GEAR_ID);
+		Property goldenGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("goldenGearItem.id",
+				Configuration.CATEGORY_ITEM, DefaultProps.GOLDEN_GEAR_ID);
+		Property diamondGearId = BuildCraftCore.mainConfiguration.getOrCreateIntProperty("diamondGearItem.id",
+				Configuration.CATEGORY_ITEM, DefaultProps.DIAMOND_GEAR_ID);
+		Property modifyWorld = BuildCraftCore.mainConfiguration.getOrCreateBooleanProperty("modifyWorld",
+				Configuration.CATEGORY_GENERAL, true);
+		modifyWorld.comment = "set to false if BuildCraft should not generate custom blocks (e.g. oil)";
+
+		BuildCraftCore.mainConfiguration.save();
+
+		BuildCraftCore.modifyWorld = modifyWorld.value.equals("true");
+
+		gearsInitialized = true;
+
+		woodenGearItem = (new ItemBuildCraft(Integer.parseInt(woodenGearId.value))).setIconIndex(1 * 16 + 0).setItemName(
+				"woodenGearItem");
+		CoreProxy.addName(woodenGearItem, "Wooden Gear");
+
+		stoneGearItem = (new ItemBuildCraft(Integer.parseInt(stoneGearId.value))).setIconIndex(1 * 16 + 1).setItemName(
+				"stoneGearItem");
+		CoreProxy.addName(stoneGearItem, "Stone Gear");
+
+		ironGearItem = (new ItemBuildCraft(Integer.parseInt(ironGearId.value))).setIconIndex(1 * 16 + 2).setItemName(
+				"ironGearItem");
+		CoreProxy.addName(ironGearItem, "Iron Gear");
+
+		goldGearItem = (new ItemBuildCraft(Integer.parseInt(goldenGearId.value))).setIconIndex(1 * 16 + 3).setItemName(
+				"goldGearItem");
+		CoreProxy.addName(goldGearItem, "Gold Gear");
+
+		diamondGearItem = (new ItemBuildCraft(Integer.parseInt(diamondGearId.value))).setIconIndex(1 * 16 + 4).setItemName(
+				"diamondGearItem");
+		CoreProxy.addName(diamondGearItem, "Diamond Gear");
+
+		BuildCraftCore.mainConfiguration.save();
+
+		ActionManager.registerTriggerProvider(new DefaultTriggerProvider());
+		ActionManager.registerActionProvider(new DefaultActionProvider());
+	}
+
+	public static void initializeModel(BaseMod mod) {
+		blockByEntityModel = ModLoader.getUniqueBlockModelID(mod, true);
+		legacyPipeModel = ModLoader.getUniqueBlockModelID(mod, true);
+		markerModel = ModLoader.getUniqueBlockModelID(mod, false);
+		oilModel = ModLoader.getUniqueBlockModelID(mod, false);
+	}
+
+}

common/buildcraft/BuildCraftEnergy.java

@@ -6,34 +6,42 @@
  * granted by the copyright holder.
  */
 
-package net.minecraft.src;
+package buildcraft;
 
 import java.util.Random;
 import java.util.TreeMap;
 
-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;
-import net.minecraft.src.buildcraft.api.liquids.LiquidData;
-import net.minecraft.src.buildcraft.api.liquids.LiquidManager;
-import net.minecraft.src.buildcraft.api.liquids.LiquidStack;
-import net.minecraft.src.buildcraft.api.recipes.RefineryRecipe;
-import net.minecraft.src.buildcraft.core.BlockIndex;
-import net.minecraft.src.buildcraft.core.CoreProxy;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.ItemBuildCraft;
-import net.minecraft.src.buildcraft.energy.BlockEngine;
-import net.minecraft.src.buildcraft.energy.BlockOilFlowing;
-import net.minecraft.src.buildcraft.energy.BlockOilStill;
-import net.minecraft.src.buildcraft.energy.BptBlockEngine;
-import net.minecraft.src.buildcraft.energy.Engine.EnergyStage;
-import net.minecraft.src.buildcraft.energy.GuiHandler;
-import net.minecraft.src.buildcraft.energy.ItemBucketOil;
-import net.minecraft.src.buildcraft.energy.ItemEngine;
-import net.minecraft.src.buildcraft.energy.OilBucketHandler;
-import net.minecraft.src.buildcraft.energy.OilPopulate;
-import net.minecraft.src.buildcraft.energy.TriggerEngineHeat;
+import buildcraft.mod_BuildCraftEnergy;
+import buildcraft.api.core.BuildCraftAPI;
+import buildcraft.api.fuels.IronEngineCoolant;
+import buildcraft.api.fuels.IronEngineFuel;
+import buildcraft.api.gates.Trigger;
+import buildcraft.api.liquids.LiquidData;
+import buildcraft.api.liquids.LiquidManager;
+import buildcraft.api.liquids.LiquidStack;
+import buildcraft.api.recipes.RefineryRecipe;
+import buildcraft.core.BlockIndex;
+import buildcraft.core.CoreProxy;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.ItemBuildCraft;
+import buildcraft.energy.BlockEngine;
+import buildcraft.energy.BlockOilFlowing;
+import buildcraft.energy.BlockOilStill;
+import buildcraft.energy.BptBlockEngine;
+import buildcraft.energy.GuiHandler;
+import buildcraft.energy.ItemBucketOil;
+import buildcraft.energy.ItemEngine;
+import buildcraft.energy.OilBucketHandler;
+import buildcraft.energy.OilPopulate;
+import buildcraft.energy.TriggerEngineHeat;
+import buildcraft.energy.Engine.EnergyStage;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.CraftingManager;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.Material;
+import net.minecraft.src.World;
 import net.minecraft.src.forge.Configuration;
 import net.minecraft.src.forge.MinecraftForge;
 import net.minecraft.src.forge.Property;
@@ -103,13 +111,11 @@ public class BuildCraftEnergy {
 		CoreProxy.addName(new ItemStack(engineBlock, 1, 1), "Steam Engine");
 		CoreProxy.addName(new ItemStack(engineBlock, 1, 2), "Combustion Engine");
 
-		oilMoving = (new BlockOilFlowing(Integer.parseInt(oilMovingId.value), Material.water)).setHardness(100F)
-				.setLightOpacity(3).setBlockName("oil");
+		oilMoving = (new BlockOilFlowing(Integer.parseInt(oilMovingId.value), Material.water)).setBlockName("oil");
 		CoreProxy.addName(oilMoving.setBlockName("oilMoving"), "Oil");
 		CoreProxy.registerBlock(oilMoving);
 
-		oilStill = (new BlockOilStill(Integer.parseInt(oilStillId.value), Material.water)).setHardness(100F).setLightOpacity(3)
-				.setBlockName("oil");
+		oilStill = (new BlockOilStill(Integer.parseInt(oilStillId.value), Material.water)).setBlockName("oil");
 		CoreProxy.addName(oilStill.setBlockName("oilStill"), "Oil");
 		CoreProxy.registerBlock(oilStill);
 
@@ -152,15 +158,14 @@ public class BuildCraftEnergy {
 	}
 
 	public static void loadRecipes() {
-		CraftingManager craftingmanager = CraftingManager.getInstance();
 
-		craftingmanager.addRecipe(new ItemStack(engineBlock, 1, 0), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
+		CoreProxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 0), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
 				Block.planks, Character.valueOf('g'), Block.glass, Character.valueOf('G'), BuildCraftCore.woodenGearItem,
 				Character.valueOf('p'), Block.pistonBase });
-		craftingmanager.addRecipe(new ItemStack(engineBlock, 1, 1), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
+		CoreProxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 1), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
 				Block.cobblestone, Character.valueOf('g'), Block.glass, Character.valueOf('G'), BuildCraftCore.stoneGearItem,
 				Character.valueOf('p'), Block.pistonBase });
-		craftingmanager.addRecipe(new ItemStack(engineBlock, 1, 2), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
+		CoreProxy.addCraftingRecipe(new ItemStack(engineBlock, 1, 2), new Object[] { "www", " g ", "GpG", Character.valueOf('w'),
 				Item.ingotIron, Character.valueOf('g'), Block.glass, Character.valueOf('G'), BuildCraftCore.ironGearItem,
 				Character.valueOf('p'), Block.pistonBase });
 	}

common/buildcraft/BuildCraftFactory.java

@@ -6,34 +6,40 @@
  * granted by the copyright holder.
  */
 
-package net.minecraft.src;
+package buildcraft;
 
-import net.minecraft.src.buildcraft.core.CoreProxy;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.factory.BlockAutoWorkbench;
-import net.minecraft.src.buildcraft.factory.BlockFrame;
-import net.minecraft.src.buildcraft.factory.BlockHopper;
-import net.minecraft.src.buildcraft.factory.BlockMiningWell;
-import net.minecraft.src.buildcraft.factory.BlockPlainPipe;
-import net.minecraft.src.buildcraft.factory.BlockPump;
-import net.minecraft.src.buildcraft.factory.BlockQuarry;
-import net.minecraft.src.buildcraft.factory.BlockRefinery;
-import net.minecraft.src.buildcraft.factory.BlockTank;
-import net.minecraft.src.buildcraft.factory.BptBlockAutoWorkbench;
-import net.minecraft.src.buildcraft.factory.BptBlockFrame;
-import net.minecraft.src.buildcraft.factory.BptBlockRefinery;
-import net.minecraft.src.buildcraft.factory.BptBlockTank;
-import net.minecraft.src.buildcraft.factory.GuiHandler;
-import net.minecraft.src.buildcraft.factory.TileAssemblyTable;
-import net.minecraft.src.buildcraft.factory.TileAutoWorkbench;
-import net.minecraft.src.buildcraft.factory.TileHopper;
-import net.minecraft.src.buildcraft.factory.TileMiningWell;
-import net.minecraft.src.buildcraft.factory.TilePump;
-import net.minecraft.src.buildcraft.factory.TileQuarry;
-import net.minecraft.src.buildcraft.factory.TileRefinery;
-import net.minecraft.src.buildcraft.factory.TileTank;
-import net.minecraft.src.buildcraft.factory.network.ConnectionHandler;
-import net.minecraft.src.buildcraft.silicon.TileLaser;
+import buildcraft.mod_BuildCraftCore;
+import buildcraft.mod_BuildCraftFactory;
+import buildcraft.core.CoreProxy;
+import buildcraft.core.DefaultProps;
+import buildcraft.factory.BlockAutoWorkbench;
+import buildcraft.factory.BlockFrame;
+import buildcraft.factory.BlockHopper;
+import buildcraft.factory.BlockMiningWell;
+import buildcraft.factory.BlockPlainPipe;
+import buildcraft.factory.BlockPump;
+import buildcraft.factory.BlockQuarry;
+import buildcraft.factory.BlockRefinery;
+import buildcraft.factory.BlockTank;
+import buildcraft.factory.BptBlockAutoWorkbench;
+import buildcraft.factory.BptBlockFrame;
+import buildcraft.factory.BptBlockRefinery;
+import buildcraft.factory.BptBlockTank;
+import buildcraft.factory.GuiHandler;
+import buildcraft.factory.TileAssemblyTable;
+import buildcraft.factory.TileAutoWorkbench;
+import buildcraft.factory.TileHopper;
+import buildcraft.factory.TileMiningWell;
+import buildcraft.factory.TilePump;
+import buildcraft.factory.TileQuarry;
+import buildcraft.factory.TileRefinery;
+import buildcraft.factory.TileTank;
+import buildcraft.factory.network.ConnectionHandler;
+import buildcraft.silicon.TileLaser;
+import net.minecraft.src.Block;
+import net.minecraft.src.CraftingManager;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
 import net.minecraft.src.forge.Configuration;
 import net.minecraft.src.forge.MinecraftForge;
 import net.minecraft.src.forge.Property;
@@ -164,34 +170,33 @@ public class BuildCraftFactory {
 	}
 
 	public static void loadRecipes() {
-		CraftingManager craftingmanager = CraftingManager.getInstance();
 
 		if (allowMining) {
-			craftingmanager.addRecipe(new ItemStack(miningWellBlock, 1),
+			CoreProxy.addCraftingRecipe(new ItemStack(miningWellBlock, 1),
 					new Object[] { "ipi", "igi", "iPi", Character.valueOf('p'), Item.redstone, Character.valueOf('i'),
 							Item.ingotIron, Character.valueOf('g'), BuildCraftCore.ironGearItem, Character.valueOf('P'),
 							Item.pickaxeSteel });
 
-			craftingmanager.addRecipe(new ItemStack(quarryBlock), new Object[] { "ipi", "gig", "dDd", Character.valueOf('i'),
+			CoreProxy.addCraftingRecipe(new ItemStack(quarryBlock), new Object[] { "ipi", "gig", "dDd", Character.valueOf('i'),
 					BuildCraftCore.ironGearItem, Character.valueOf('p'), Item.redstone, Character.valueOf('g'),
 					BuildCraftCore.goldGearItem, Character.valueOf('d'), BuildCraftCore.diamondGearItem, Character.valueOf('D'),
 					Item.pickaxeDiamond, });
 		}
 
-		craftingmanager.addRecipe(new ItemStack(autoWorkbenchBlock), new Object[] { " g ", "gwg", " g ", Character.valueOf('w'),
+		CoreProxy.addCraftingRecipe(new ItemStack(autoWorkbenchBlock), new Object[] { " g ", "gwg", " g ", Character.valueOf('w'),
 				Block.workbench, Character.valueOf('g'), BuildCraftCore.woodenGearItem });
 
-		craftingmanager.addRecipe(new ItemStack(pumpBlock), new Object[] { "T ", "W ", Character.valueOf('T'), tankBlock,
+		CoreProxy.addCraftingRecipe(new ItemStack(pumpBlock), new Object[] { "T ", "W ", Character.valueOf('T'), tankBlock,
 				Character.valueOf('W'), miningWellBlock, });
 
-		craftingmanager.addRecipe(new ItemStack(tankBlock), new Object[] { "ggg", "g g", "ggg", Character.valueOf('g'),
+		CoreProxy.addCraftingRecipe(new ItemStack(tankBlock), new Object[] { "ggg", "g g", "ggg", Character.valueOf('g'),
 				Block.glass, });
 
-		craftingmanager.addRecipe(new ItemStack(refineryBlock), new Object[] { "   ", "RTR", "TGT", Character.valueOf('T'),
+		CoreProxy.addCraftingRecipe(new ItemStack(refineryBlock), new Object[] { "   ", "RTR", "TGT", Character.valueOf('T'),
 				tankBlock, Character.valueOf('G'), BuildCraftCore.diamondGearItem, Character.valueOf('R'),
 				Block.torchRedstoneActive, });
 		if (!hopperDisabled) {
-			craftingmanager.addRecipe(new ItemStack(hopperBlock), new Object[] { "ICI", "IGI", " I ", Character.valueOf('I'),
+			CoreProxy.addCraftingRecipe(new ItemStack(hopperBlock), new Object[] { "ICI", "IGI", " I ", Character.valueOf('I'),
 					Item.ingotIron, Character.valueOf('C'), Block.chest, Character.valueOf('G'), BuildCraftCore.stoneGearItem });
 		}
 

common/buildcraft/BuildCraftSilicon.java

@@ -6,18 +6,26 @@
  * granted by the copyright holder.
  */
 
-package net.minecraft.src;
+package buildcraft;
 
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockInventory;
-import net.minecraft.src.buildcraft.api.bptblocks.BptBlockRotateMeta;
-import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe;
-import net.minecraft.src.buildcraft.core.CoreProxy;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.ItemRedstoneChipset;
-import net.minecraft.src.buildcraft.silicon.BlockAssemblyTable;
-import net.minecraft.src.buildcraft.silicon.BlockLaser;
-import net.minecraft.src.buildcraft.silicon.GuiHandler;
-import net.minecraft.src.buildcraft.silicon.network.ConnectionHandler;
+import buildcraft.mod_BuildCraftCore;
+import buildcraft.mod_BuildCraftSilicon;
+import buildcraft.api.bptblocks.BptBlockInventory;
+import buildcraft.api.bptblocks.BptBlockRotateMeta;
+import buildcraft.api.recipes.AssemblyRecipe;
+import buildcraft.core.CoreProxy;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.ItemRedstoneChipset;
+import buildcraft.silicon.BlockAssemblyTable;
+import buildcraft.silicon.BlockLaser;
+import buildcraft.silicon.GuiHandler;
+import buildcraft.silicon.network.ConnectionHandler;
+import net.minecraft.src.BaseMod;
+import net.minecraft.src.Block;
+import net.minecraft.src.CraftingManager;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.ModLoader;
 import net.minecraft.src.forge.MinecraftForge;
 import net.minecraft.src.forge.Property;
 
@@ -163,10 +171,10 @@ public class BuildCraftSilicon {
 	public static void loadRecipes() {
 		CraftingManager craftingmanager = CraftingManager.getInstance();
 
-		craftingmanager.addRecipe(new ItemStack(laserBlock), new Object[] { "ORR", "DDR", "ORR", Character.valueOf('O'),
+		CoreProxy.addCraftingRecipe(new ItemStack(laserBlock), new Object[] { "ORR", "DDR", "ORR", Character.valueOf('O'),
 				Block.obsidian, Character.valueOf('R'), Item.redstone, Character.valueOf('D'), Item.diamond, });
 
-		craftingmanager.addRecipe(new ItemStack(assemblyTableBlock),
+		CoreProxy.addCraftingRecipe(new ItemStack(assemblyTableBlock),
 				new Object[] { "ORO", "ODO", "OGO", Character.valueOf('O'), Block.obsidian, Character.valueOf('R'),
 						Item.redstone, Character.valueOf('D'), Item.diamond, Character.valueOf('G'),
 						BuildCraftCore.diamondGearItem, });
@@ -174,39 +182,39 @@ public class BuildCraftSilicon {
 		//Add reverse recipies for all gates
 		
 		//Iron
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 2), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 2), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 1)});
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 1), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 1), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 2)});
 		
 		//Gold
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 4), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 4), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 3)});
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 3), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 3), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 4)});
 
 		//Diamond
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 6), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 6), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 5)});
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 5), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGate, 1, 5), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGate, 1, 6)});
 		
 		//Iron - Autarchic
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 2), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 2), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 1)});
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 1), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 1), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 2)});
 		
 		//Gold - Autarchic
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 4), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 4), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 3)});
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 3), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 3), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 4)});
 
 		//Diamond - Autarchic
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 6), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 6), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 5)});
-		craftingmanager.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 5), 
+		CoreProxy.addShapelessRecipe(new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 5), 
 				new Object[]{new ItemStack(redstoneChipset, 1, 0), new ItemStack(BuildCraftTransport.pipeGateAutarchic, 1, 6)});
 		
 		

common/buildcraft/BuildCraftTransport.java

@@ -6,64 +6,72 @@
  * granted by the copyright holder.
  */
 
-package net.minecraft.src;
+package buildcraft;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-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;
-import net.minecraft.src.buildcraft.api.recipes.AssemblyRecipe;
-import net.minecraft.src.buildcraft.api.transport.IPipe;
-import net.minecraft.src.buildcraft.core.CoreProxy;
-import net.minecraft.src.buildcraft.core.DefaultProps;
-import net.minecraft.src.buildcraft.core.ItemBuildCraft;
-import net.minecraft.src.buildcraft.transport.ActionEnergyPulser;
-import net.minecraft.src.buildcraft.transport.ActionSignalOutput;
-import net.minecraft.src.buildcraft.transport.BlockGenericPipe;
-import net.minecraft.src.buildcraft.transport.BptBlockPipe;
-import net.minecraft.src.buildcraft.transport.BptItemPipeDiamond;
-import net.minecraft.src.buildcraft.transport.BptItemPipeIron;
-import net.minecraft.src.buildcraft.transport.BptItemPipeWodden;
-import net.minecraft.src.buildcraft.transport.GuiHandler;
-import net.minecraft.src.buildcraft.transport.ItemFacade;
-import net.minecraft.src.buildcraft.transport.ItemGate;
-import net.minecraft.src.buildcraft.transport.ItemPipe;
-import net.minecraft.src.buildcraft.transport.Pipe;
-import net.minecraft.src.buildcraft.transport.PipeLogicWood;
-import net.minecraft.src.buildcraft.transport.PipeTriggerProvider;
-import net.minecraft.src.buildcraft.transport.TileDummyGenericPipe;
-import net.minecraft.src.buildcraft.transport.TileDummyGenericPipe2;
-import net.minecraft.src.buildcraft.transport.TileGenericPipe;
-import net.minecraft.src.buildcraft.transport.TriggerPipeContents;
-import net.minecraft.src.buildcraft.transport.TriggerPipeContents.Kind;
-import net.minecraft.src.buildcraft.transport.TriggerPipeSignal;
-import net.minecraft.src.buildcraft.transport.network.ConnectionHandler;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsCobblestone;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsDiamond;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsGold;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsIron;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsObsidian;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsSandstone;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsStone;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsStripes;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsVoid;
-import net.minecraft.src.buildcraft.transport.pipes.PipeItemsWood;
-import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsCobblestone;
-import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsGold;
-import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsIron;
-import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsSandstone;
-import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsStone;
-import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsVoid;
-import net.minecraft.src.buildcraft.transport.pipes.PipeLiquidsWood;
-import net.minecraft.src.buildcraft.transport.pipes.PipePowerGold;
-import net.minecraft.src.buildcraft.transport.pipes.PipePowerStone;
-import net.minecraft.src.buildcraft.transport.pipes.PipePowerWood;
-import net.minecraft.src.buildcraft.transport.pipes.PipeStructureCobblestone;
+import buildcraft.mod_BuildCraftCore;
+import buildcraft.mod_BuildCraftTransport;
+import buildcraft.api.core.BuildCraftAPI;
+import buildcraft.api.gates.Action;
+import buildcraft.api.gates.ActionManager;
+import buildcraft.api.gates.Trigger;
+import buildcraft.api.recipes.AssemblyRecipe;
+import buildcraft.api.transport.IPipe;
+import buildcraft.core.CoreProxy;
+import buildcraft.core.DefaultProps;
+import buildcraft.core.ItemBuildCraft;
+import buildcraft.transport.ActionEnergyPulser;
+import buildcraft.transport.ActionSignalOutput;
+import buildcraft.transport.BlockGenericPipe;
+import buildcraft.transport.BptBlockPipe;
+import buildcraft.transport.BptItemPipeDiamond;
+import buildcraft.transport.BptItemPipeIron;
+import buildcraft.transport.BptItemPipeWodden;
+import buildcraft.transport.GuiHandler;
+import buildcraft.transport.ItemFacade;
+import buildcraft.transport.ItemGate;
+import buildcraft.transport.ItemPipe;
+import buildcraft.transport.Pipe;
+import buildcraft.transport.PipeLogicWood;
+import buildcraft.transport.PipeTriggerProvider;
+import buildcraft.transport.TileDummyGenericPipe;
+import buildcraft.transport.TileDummyGenericPipe2;
+import buildcraft.transport.TileGenericPipe;
+import buildcraft.transport.TriggerPipeContents;
+import buildcraft.transport.TriggerPipeSignal;
+import buildcraft.transport.TriggerPipeContents.Kind;
+import buildcraft.transport.network.ConnectionHandler;
+import buildcraft.transport.pipes.PipeItemsCobblestone;
+import buildcraft.transport.pipes.PipeItemsDiamond;
+import buildcraft.transport.pipes.PipeItemsGold;
+import buildcraft.transport.pipes.PipeItemsIron;
+import buildcraft.transport.pipes.PipeItemsObsidian;
+import buildcraft.transport.pipes.PipeItemsSandstone;
+import buildcraft.transport.pipes.PipeItemsStone;
+import buildcraft.transport.pipes.PipeItemsStripes;
+import buildcraft.transport.pipes.PipeItemsVoid;
+import buildcraft.transport.pipes.PipeItemsWood;
+import buildcraft.transport.pipes.PipeLiquidsCobblestone;
+import buildcraft.transport.pipes.PipeLiquidsGold;
+import buildcraft.transport.pipes.PipeLiquidsIron;
+import buildcraft.transport.pipes.PipeLiquidsSandstone;
+import buildcraft.transport.pipes.PipeLiquidsStone;
+import buildcraft.transport.pipes.PipeLiquidsVoid;
+import buildcraft.transport.pipes.PipeLiquidsWood;
+import buildcraft.transport.pipes.PipePowerGold;
+import buildcraft.transport.pipes.PipePowerStone;
+import buildcraft.transport.pipes.PipePowerWood;
+import buildcraft.transport.pipes.PipeStructureCobblestone;
+
+import net.minecraft.src.Block;
+import net.minecraft.src.CraftingManager;
+import net.minecraft.src.Item;
+import net.minecraft.src.ItemStack;
+import net.minecraft.src.ModLoader;
 import net.minecraft.src.forge.Configuration;
 import net.minecraft.src.forge.MinecraftForge;
 import net.minecraft.src.forge.Property;
@@ -335,18 +343,17 @@ public class BuildCraftTransport {
 	}
 
 	public static void loadRecipes() {
-		CraftingManager craftingmanager = CraftingManager.getInstance();
 
 		// Add base recipe for pipe waterproof.
-		craftingmanager.addRecipe(new ItemStack(pipeWaterproof, 1), new Object[] { "W ", "  ", Character.valueOf('W'),
+		CoreProxy.addCraftingRecipe(new ItemStack(pipeWaterproof, 1), new Object[] { "W ", "  ", Character.valueOf('W'),
 				new ItemStack(Item.dyePowder, 1, 2) });
 
 		// Add pipe recipes
-		for (PipeRecipe p : pipeRecipes)
-			if (p.isShapeless)
-				craftingmanager.addShapelessRecipe(p.result, p.input);
+		for (PipeRecipe pipe : pipeRecipes)
+			if (pipe.isShapeless)
+				CoreProxy.addShapelessRecipe(pipe.result, pipe.input);
 			else
-				craftingmanager.addRecipe(p.result, p.input);
+				CoreProxy.addCraftingRecipe(pipe.result, pipe.input);
 	}
 
 	private static Item createPipe(int defaultID, Class<? extends Pipe> clas, String descr, Object ingredient1,

common/buildcraft/api/blueprints/BlockSignature.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api.blueprints;
+package buildcraft.api.blueprints;
 
 public class BlockSignature {
 

common/buildcraft/api/blueprints/BlueprintManager.java

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

common/buildcraft/api/blueprints/BptBlock.java

@@ -7,17 +7,18 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package net.minecraft.src.buildcraft.api.blueprints;
+package buildcraft.api.blueprints;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 
+import buildcraft.api.core.BuildCraftAPI;
+
 import net.minecraft.src.Block;
 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.core.BuildCraftAPI;
 
 /**
  * This class allow to specify specific behavior for blocks stored in
@@ -28,7 +29,7 @@ import net.minecraft.src.buildcraft.api.core.BuildCraftAPI;
  * load in the blueprint
  * 
  * Default implementations of this can be seen in the package
- * net.minecraft.src.buildcraft.api.bptblocks. The class BptBlockUtils provide
+ * buildcraft.api.bptblocks. The class BptBlockUtils provide
  * some additional utilities.
  * 
  * Blueprints perform "id translation" in case the block ids between a blueprint

common/buildcraft/api/blueprints/BptSlotInfo.java

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