checkstyle fixes, module fixes, prepare for early beta release

api/buildcraft/api/core/EnumColor.java

@@ -11,7 +11,6 @@ package buildcraft.api.core;
 import java.util.Locale;
 import java.util.Random;
 
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
 

api/buildcraft/api/core/IPathProvider.java

@@ -1,7 +1,6 @@
 package buildcraft.api.core;
 
 import java.util.List;
-import buildcraft.api.core.BlockIndex;
 
 /**
  * To be implemented by TileEntities able to provide a path on the world, typically BuildCraft path markers.

api/buildcraft/api/facades/FacadeAPI.java

@@ -1,5 +1,9 @@
 package buildcraft.api.facades;
 
-public class FacadeAPI {
+public final class FacadeAPI {
 	public static IFacadeItem facadeItem;
+
+	private FacadeAPI() {
+
+	}
 }

api/buildcraft/api/gates/GateExpansions.java

@@ -13,7 +13,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public final class GateExpansions {

api/buildcraft/api/library/LibraryAPI.java

@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-public class LibraryAPI {
+public final class LibraryAPI {
 	private static final Set<ILibraryTypeHandler> handlers = new HashSet<ILibraryTypeHandler>();
 	private static final Map<String, ILibraryTypeHandler> handlersByExt = new HashMap<String, ILibraryTypeHandler>();
 

api/buildcraft/api/robots/ResourceIdBlock.java

@@ -11,7 +11,6 @@ package buildcraft.api.robots;
 import net.minecraft.tileentity.TileEntity;
 
 import buildcraft.api.core.BlockIndex;
-import buildcraft.api.robots.ResourceId;
 
 public class ResourceIdBlock extends ResourceId {
 

api/buildcraft/api/robots/ResourceIdRequest.java

@@ -11,7 +11,6 @@ package buildcraft.api.robots;
 import net.minecraft.tileentity.TileEntity;
 
 import buildcraft.api.core.BlockIndex;
-import buildcraft.api.robots.ResourceId;
 
 public class ResourceIdRequest extends ResourceId {
 

api/buildcraft/api/statements/IStatementContainer.java

@@ -8,7 +8,6 @@
  */
 package buildcraft.api.statements;
 
-import java.util.List;
 import net.minecraft.tileentity.TileEntity;
 
 /**

common/buildcraft/BuildCraftBuilders.java

@@ -12,7 +12,6 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
-
 import net.minecraft.entity.item.EntityItemFrame;
 import net.minecraft.entity.item.EntityMinecartChest;
 import net.minecraft.entity.item.EntityMinecartEmpty;
@@ -26,7 +25,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.stats.Achievement;
-
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
@@ -39,12 +37,10 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
-
 import buildcraft.api.blueprints.BlueprintDeployer;
 import buildcraft.api.blueprints.BuilderAPI;
 import buildcraft.api.blueprints.ISchematicRegistry;
@@ -60,7 +56,6 @@ import buildcraft.api.library.LibraryAPI;
 import buildcraft.api.statements.StatementManager;
 import buildcraft.builders.BlockArchitect;
 import buildcraft.builders.BlockBlueprintLibrary;
-import buildcraft.core.BlockBuildTool;
 import buildcraft.builders.BlockBuilder;
 import buildcraft.builders.BlockConstructionMarker;
 import buildcraft.builders.BlockFiller;
@@ -68,14 +63,15 @@ import buildcraft.builders.BlockMarker;
 import buildcraft.builders.BlockPathMarker;
 import buildcraft.builders.BlueprintServerDatabase;
 import buildcraft.builders.BuilderProxy;
-import buildcraft.builders.EventHandlerBuilders;
 import buildcraft.builders.BuildersGuiHandler;
+import buildcraft.builders.EventHandlerBuilders;
 import buildcraft.builders.HeuristicBlockDetection;
 import buildcraft.builders.ItemBlueprintStandard;
 import buildcraft.builders.ItemBlueprintTemplate;
 import buildcraft.builders.ItemConstructionMarker;
 import buildcraft.builders.LibraryBlueprintTypeHandler;
 import buildcraft.builders.LibraryBookTypeHandler;
+import buildcraft.builders.LibraryDatabase;
 import buildcraft.builders.TileArchitect;
 import buildcraft.builders.TileBlueprintLibrary;
 import buildcraft.builders.TileBuilder;
@@ -83,10 +79,10 @@ import buildcraft.builders.TileConstructionMarker;
 import buildcraft.builders.TileFiller;
 import buildcraft.builders.TileMarker;
 import buildcraft.builders.TilePathMarker;
-import buildcraft.builders.LibraryDatabase;
+import buildcraft.builders.blueprints.RealBlueprintDeployer;
 import buildcraft.builders.schematics.SchematicAir;
 import buildcraft.builders.schematics.SchematicBed;
-import buildcraft.builders.schematics.SchematicBlockCreative;
+import buildcraft.core.builders.schematics.SchematicBlockCreative;
 import buildcraft.builders.schematics.SchematicCactus;
 import buildcraft.builders.schematics.SchematicCustomStack;
 import buildcraft.builders.schematics.SchematicDirt;
@@ -100,7 +96,7 @@ import buildcraft.builders.schematics.SchematicFire;
 import buildcraft.builders.schematics.SchematicGlassPane;
 import buildcraft.builders.schematics.SchematicGravel;
 import buildcraft.builders.schematics.SchematicHanging;
-import buildcraft.builders.schematics.SchematicIgnore;
+import buildcraft.core.builders.schematics.SchematicIgnore;
 import buildcraft.builders.schematics.SchematicLever;
 import buildcraft.builders.schematics.SchematicMinecart;
 import buildcraft.builders.schematics.SchematicPiston;
@@ -110,16 +106,16 @@ import buildcraft.builders.schematics.SchematicRail;
 import buildcraft.builders.schematics.SchematicRedstoneDiode;
 import buildcraft.builders.schematics.SchematicRedstoneLamp;
 import buildcraft.builders.schematics.SchematicRedstoneWire;
-import buildcraft.builders.schematics.SchematicRotateMeta;
+import buildcraft.core.builders.schematics.SchematicRotateMeta;
 import buildcraft.builders.schematics.SchematicSeeds;
 import buildcraft.builders.schematics.SchematicSign;
 import buildcraft.builders.schematics.SchematicSkull;
 import buildcraft.builders.schematics.SchematicStairs;
-import buildcraft.builders.schematics.SchematicStandalone;
+import buildcraft.core.builders.schematics.SchematicStandalone;
 import buildcraft.builders.schematics.SchematicStone;
-import buildcraft.builders.schematics.SchematicTileCreative;
+import buildcraft.core.builders.schematics.SchematicTileCreative;
 import buildcraft.builders.schematics.SchematicTripWireHook;
-import buildcraft.builders.schematics.SchematicWallSide;
+import buildcraft.core.builders.schematics.SchematicWallSide;
 import buildcraft.builders.statements.BuildersActionProvider;
 import buildcraft.builders.urbanism.BlockUrbanist;
 import buildcraft.builders.urbanism.TileUrbanist;
@@ -128,7 +124,6 @@ import buildcraft.core.CompatHooks;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.InterModComms;
 import buildcraft.core.Version;
-import buildcraft.builders.blueprints.RealBlueprintDeployer;
 import buildcraft.core.blueprints.SchematicRegistry;
 import buildcraft.core.builders.patterns.FillerPattern;
 import buildcraft.core.builders.patterns.FillerRegistry;

common/buildcraft/BuildCraftCore.java

@@ -14,13 +14,10 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.util.HashSet;
 import java.util.UUID;
-
 import com.mojang.authlib.GameProfile;
-
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.glu.GLU;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.client.renderer.GLAllocation;
@@ -31,7 +28,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.Achievement;
 import net.minecraft.util.IIcon;
-
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -43,7 +39,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.IPlantable;
@@ -52,7 +47,6 @@ import net.minecraftforge.common.config.Property;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fluids.BlockFluidBase;
 import net.minecraftforge.oredict.OreDictionary;
-
 import buildcraft.api.blueprints.BuilderAPI;
 import buildcraft.api.core.BCLog;
 import buildcraft.api.core.BuildCraftAPI;
@@ -60,7 +54,6 @@ import buildcraft.api.core.EnumColor;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.api.core.IWorldProperty;
 import buildcraft.api.core.JavaTools;
-import buildcraft.api.fuels.BuildcraftFuelRegistry;
 import buildcraft.api.recipes.BuildcraftRecipeRegistry;
 import buildcraft.api.statements.IActionExternal;
 import buildcraft.api.statements.IActionInternal;
@@ -73,13 +66,14 @@ import buildcraft.api.tiles.IControllable;
 import buildcraft.core.AchievementManager;
 import buildcraft.core.BCCreativeTab;
 import buildcraft.core.BlockBuildTool;
+import buildcraft.core.BlockEngine;
 import buildcraft.core.BlockSpring;
 import buildcraft.core.BuildCraftConfiguration;
 import buildcraft.core.CommandBuildCraft;
 import buildcraft.core.CompatHooks;
+import buildcraft.core.CoreGuiHandler;
 import buildcraft.core.CoreIconProvider;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.CoreGuiHandler;
 import buildcraft.core.InterModComms;
 import buildcraft.core.ItemDebugger;
 import buildcraft.core.ItemGear;
@@ -88,16 +82,27 @@ import buildcraft.core.ItemMapLocation;
 import buildcraft.core.ItemPaintbrush;
 import buildcraft.core.ItemSpring;
 import buildcraft.core.ItemWrench;
+import buildcraft.core.SchematicEngine;
 import buildcraft.core.SpringPopulate;
 import buildcraft.core.TickHandlerCore;
+import buildcraft.core.TileEngineWood;
 import buildcraft.core.Version;
 import buildcraft.core.blueprints.SchematicRegistry;
-import buildcraft.core.BlockEngine;
+import buildcraft.core.lib.engines.ItemEngine;
 import buildcraft.core.lib.engines.TileEngineBase;
-import buildcraft.core.TileEngineWood;
 import buildcraft.core.lib.network.ChannelHandler;
 import buildcraft.core.lib.network.PacketHandler;
+import buildcraft.core.lib.utils.ColorUtils;
 import buildcraft.core.lib.utils.NBTUtils;
+import buildcraft.core.properties.WorldPropertyIsDirt;
+import buildcraft.core.properties.WorldPropertyIsFarmland;
+import buildcraft.core.properties.WorldPropertyIsFluidSource;
+import buildcraft.core.properties.WorldPropertyIsHarvestable;
+import buildcraft.core.properties.WorldPropertyIsLeaf;
+import buildcraft.core.properties.WorldPropertyIsOre;
+import buildcraft.core.properties.WorldPropertyIsShoveled;
+import buildcraft.core.properties.WorldPropertyIsSoft;
+import buildcraft.core.properties.WorldPropertyIsWood;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.recipes.AssemblyRecipeManager;
 import buildcraft.core.recipes.IntegrationRecipeManager;
@@ -117,20 +122,6 @@ import buildcraft.core.statements.TriggerInventory;
 import buildcraft.core.statements.TriggerInventoryLevel;
 import buildcraft.core.statements.TriggerMachine;
 import buildcraft.core.statements.TriggerRedstoneInput;
-import buildcraft.core.lib.utils.ColorUtils;
-import buildcraft.core.properties.WorldPropertyIsDirt;
-import buildcraft.core.properties.WorldPropertyIsFarmland;
-import buildcraft.core.properties.WorldPropertyIsFluidSource;
-import buildcraft.core.properties.WorldPropertyIsHarvestable;
-import buildcraft.core.properties.WorldPropertyIsLeaf;
-import buildcraft.core.properties.WorldPropertyIsOre;
-import buildcraft.core.properties.WorldPropertyIsShoveled;
-import buildcraft.core.properties.WorldPropertyIsSoft;
-import buildcraft.core.properties.WorldPropertyIsWood;
-import buildcraft.core.lib.engines.ItemEngine;
-import buildcraft.core.SchematicEngine;
-import buildcraft.energy.fuels.CoolantManager;
-import buildcraft.energy.fuels.FuelManager;
 
 @Mod(name = "BuildCraft", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Core", acceptedMinecraftVersions = "[1.7.10,1.8)", dependencies = "required-after:Forge@[10.13.2.1236,)")
 public class BuildCraftCore extends BuildCraftMod {
@@ -142,6 +133,7 @@ public class BuildCraftCore extends BuildCraftMod {
 	public static enum RenderMode {
 		Full, NoDynamic
 	}
+
 	public static RenderMode render = RenderMode.Full;
 	public static boolean debugWorldgen = false;
 	public static boolean modifyWorld = false;
@@ -241,9 +233,6 @@ public class BuildCraftCore extends BuildCraftMod {
 		BuildcraftRecipeRegistry.refinery = RefineryRecipeManager.INSTANCE;
 		BuildcraftRecipeRegistry.programmingTable = ProgrammingRecipeManager.INSTANCE;
 
-		BuildcraftFuelRegistry.fuel = FuelManager.INSTANCE;
-		BuildcraftFuelRegistry.coolant = CoolantManager.INSTANCE;
-
 		BuilderAPI.schematicRegistry = SchematicRegistry.INSTANCE;
 		
 		mainConfiguration = new BuildCraftConfiguration(new File(evt.getModConfigurationDirectory(), "buildcraft/main.conf"));

common/buildcraft/BuildCraftEnergy.java

@@ -9,9 +9,7 @@
 package buildcraft;
 
 import java.util.Set;
-
 import org.apache.logging.log4j.Level;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
@@ -21,7 +19,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.Achievement;
 import net.minecraft.world.biome.BiomeGenBase;
-
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
@@ -33,7 +30,6 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.MinecraftForge;
@@ -42,7 +38,6 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-
 import buildcraft.api.core.BCLog;
 import buildcraft.api.core.JavaTools;
 import buildcraft.api.core.StackKey;
@@ -54,26 +49,28 @@ import buildcraft.core.BlockSpring;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.InterModComms;
 import buildcraft.core.Version;
-import buildcraft.core.lib.network.ChannelHandler;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.lib.block.BlockBuildCraftFluid;
-import buildcraft.energy.BucketHandler;
-import buildcraft.energy.EnergyProxy;
-import buildcraft.energy.EnergyGuiHandler;
-import buildcraft.energy.IMCHandlerEnergy;
-import buildcraft.energy.ItemBucketBuildcraft;
 import buildcraft.core.lib.engines.TileEngineBase;
 import buildcraft.core.lib.engines.TileEngineBase.EnergyStage;
+import buildcraft.core.lib.network.ChannelHandler;
+import buildcraft.core.lib.network.PacketHandler;
+import buildcraft.core.proxy.CoreProxy;
+import buildcraft.energy.BucketHandler;
+import buildcraft.energy.EnergyGuiHandler;
+import buildcraft.energy.EnergyProxy;
+import buildcraft.energy.IMCHandlerEnergy;
+import buildcraft.energy.ItemBucketBuildcraft;
 import buildcraft.energy.TileEngineCreative;
 import buildcraft.energy.TileEngineIron;
 import buildcraft.energy.TileEngineStone;
+import buildcraft.energy.fuels.CoolantManager;
+import buildcraft.energy.fuels.FuelManager;
 import buildcraft.energy.statements.EnergyStatementProvider;
 import buildcraft.energy.statements.TriggerEngineHeat;
 import buildcraft.energy.worldgen.BiomeGenOilDesert;
 import buildcraft.energy.worldgen.BiomeGenOilOcean;
 import buildcraft.energy.worldgen.BiomeInitializer;
 import buildcraft.energy.worldgen.OilPopulate;
-import buildcraft.transport.network.PacketHandlerTransport;
 
 @Mod(name = "BuildCraft Energy", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Energy", dependencies = DefaultProps.DEPENDENCY_CORE)
 public class BuildCraftEnergy extends BuildCraftMod {
@@ -115,6 +112,9 @@ public class BuildCraftEnergy extends BuildCraftMod {
 
 	@Mod.EventHandler
 	public void preInit(FMLPreInitializationEvent evt) {
+		BuildcraftFuelRegistry.fuel = FuelManager.INSTANCE;
+		BuildcraftFuelRegistry.coolant = CoolantManager.INSTANCE;
+
 		int oilDesertBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "biomeOilDesert", DefaultProps.BIOME_OIL_DESERT).getInt(DefaultProps.BIOME_OIL_DESERT);
 		int oilOceanBiomeId = BuildCraftCore.mainConfiguration.get("biomes", "biomeOilOcean", DefaultProps.BIOME_OIL_OCEAN).getInt(DefaultProps.BIOME_OIL_OCEAN);
 		canOilBurn = BuildCraftCore.mainConfiguration.get("general", "burnOil", true, "Can oil burn?").getBoolean(true);
@@ -329,7 +329,7 @@ public class BuildCraftEnergy extends BuildCraftMod {
 	@Mod.EventHandler
 	public void init(FMLInitializationEvent evt) {
 		channels = NetworkRegistry.INSTANCE.newChannel
-				(DefaultProps.NET_CHANNEL_NAME + "-ENERGY", new ChannelHandler(),  new PacketHandlerTransport());
+				(DefaultProps.NET_CHANNEL_NAME + "-ENERGY", new ChannelHandler(), new PacketHandler());
 
 		NetworkRegistry.INSTANCE.registerGuiHandler(instance, new EnergyGuiHandler());
 

common/buildcraft/BuildCraftFactory.java

@@ -9,9 +9,7 @@
 package buildcraft;
 
 import java.util.List;
-
 import com.google.common.collect.Lists;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.init.Blocks;
@@ -19,7 +17,6 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.Achievement;
 import net.minecraft.world.World;
-
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
@@ -29,24 +26,22 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.ForgeChunkManager;
 import net.minecraftforge.common.ForgeChunkManager.Ticket;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Property;
-
 import buildcraft.api.blueprints.BuilderAPI;
 import buildcraft.api.blueprints.SchematicTile;
-import buildcraft.builders.schematics.SchematicIgnoreMeta;
+import buildcraft.core.builders.schematics.SchematicIgnoreMeta;
 import buildcraft.core.CompatHooks;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.InterModComms;
 import buildcraft.core.Version;
 import buildcraft.core.lib.network.ChannelHandler;
 import buildcraft.core.lib.network.PacketHandler;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.lib.utils.ConfigUtils;
+import buildcraft.core.proxy.CoreProxy;
 import buildcraft.factory.BlockAutoWorkbench;
 import buildcraft.factory.BlockFloodGate;
 import buildcraft.factory.BlockFrame;
@@ -57,9 +52,9 @@ import buildcraft.factory.BlockPump;
 import buildcraft.factory.BlockQuarry;
 import buildcraft.factory.BlockRefinery;
 import buildcraft.factory.BlockTank;
+import buildcraft.factory.FactoryGuiHandler;
 import buildcraft.factory.FactoryProxy;
 import buildcraft.factory.FactoryProxyClient;
-import buildcraft.factory.FactoryGuiHandler;
 import buildcraft.factory.PumpDimensionList;
 import buildcraft.factory.TileAutoWorkbench;
 import buildcraft.factory.TileFloodGate;
@@ -295,11 +290,16 @@ public class BuildCraftFactory extends BuildCraftMod {
 
 		if (autoWorkbenchBlock != null) {
 			CoreProxy.proxy.addCraftingRecipe(new ItemStack(autoWorkbenchBlock),
-					" g ",
 					"gwg",
+					'w', Blocks.crafting_table,
+					'g', "gearStone");
+
+			CoreProxy.proxy.addCraftingRecipe(new ItemStack(autoWorkbenchBlock),
+					"g",
+					"w",
 					"g",
 					'w', Blocks.crafting_table,
-					'g', "gearWood");
+					'g', "gearStone");
 		}
 
 

common/buildcraft/BuildCraftMod.java

@@ -12,11 +12,6 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedDeque;
-
-import org.apache.logging.log4j.Level;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.NetHandlerPlayServer;
@@ -25,23 +20,20 @@ import net.minecraft.network.play.server.S3FPacketCustomPayload;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-
-import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.FMLEmbeddedChannel;
 import cpw.mods.fml.common.network.FMLOutboundHandler;
 import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 import cpw.mods.fml.relauncher.Side;
-
-import buildcraft.api.core.BCLog;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.lib.network.Packet;
 
 public class BuildCraftMod {
+	private static PacketSender sender = new PacketSender();
+	private static Thread senderThread = new Thread(sender);
+
 	public EnumMap<Side, FMLEmbeddedChannel> channels;
 
-	static abstract class SendRequest {
+	abstract static class SendRequest {
 		final Packet packet;
 		final BuildCraftMod source;
 
@@ -138,9 +130,6 @@ public class BuildCraftMod {
 		}
 	}
 
-	private static PacketSender sender = new PacketSender();
-	private static Thread senderThread = new Thread(sender);
-
 	static {
 		senderThread.start();
 	}

common/buildcraft/BuildCraftRobotics.java

@@ -24,8 +24,12 @@ import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.MinecraftForge;
 import buildcraft.api.boards.RedstoneBoardRegistry;
@@ -35,6 +39,7 @@ import buildcraft.api.statements.IActionInternal;
 import buildcraft.api.statements.ITriggerInternal;
 import buildcraft.api.statements.StatementManager;
 import buildcraft.api.transport.PipeManager;
+import buildcraft.builders.urbanism.UrbanistToolsIconProvider;
 import buildcraft.core.BCCreativeTab;
 import buildcraft.core.CompatHooks;
 import buildcraft.core.DefaultProps;
@@ -50,11 +55,13 @@ import buildcraft.robotics.ImplRedstoneBoardRegistry;
 import buildcraft.robotics.ItemRedstoneBoard;
 import buildcraft.robotics.ItemRobot;
 import buildcraft.robotics.ItemRobotStation;
+import buildcraft.robotics.RobotIntegrationRecipe;
 import buildcraft.robotics.RobotRegistryProvider;
 import buildcraft.robotics.RobotStationPluggable;
 import buildcraft.robotics.RoboticsGuiHandler;
-import buildcraft.robotics.RobotIntegrationRecipe;
 import buildcraft.robotics.RoboticsProxy;
+import buildcraft.robotics.TileRequester;
+import buildcraft.robotics.TileZonePlan;
 import buildcraft.robotics.ai.AIRobotAttack;
 import buildcraft.robotics.ai.AIRobotBreak;
 import buildcraft.robotics.ai.AIRobotCraftAssemblyTable;
@@ -150,7 +157,7 @@ import buildcraft.robotics.statements.TriggerRobotLinked;
 import buildcraft.robotics.statements.TriggerRobotSleep;
 import buildcraft.silicon.ItemRedstoneChipset;
 
-@Mod(name = "BuildCraft Robotics", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Robotics", dependencies = DefaultProps.DEPENDENCY_SILICON_TRANSPORT)
+@Mod(name = "BuildCraft Robotics", version = Version.VERSION, useMetadata = false, modid = "BuildCraft|Robotics", dependencies = DefaultProps.DEPENDENCY_CORE)
 public class BuildCraftRobotics extends BuildCraftMod {
 	@Mod.Instance("BuildCraft|Robotics")
 	public static BuildCraftRobotics instance;
@@ -254,8 +261,9 @@ public class BuildCraftRobotics extends BuildCraftMod {
 	@Mod.EventHandler
 	public void init(FMLInitializationEvent evt) {
 		NetworkRegistry.INSTANCE.registerGuiHandler(instance, new RoboticsGuiHandler());
+		MinecraftForge.EVENT_BUS.register(this);
 
-		if (BuildCraftCore.loadDefaultRecipes) {
+		if (BuildCraftCore.loadDefaultRecipes && Loader.isModLoaded("BuildCraft|Silicon")) {
 			loadRecipes();
 		}
 
@@ -264,6 +272,9 @@ public class BuildCraftRobotics extends BuildCraftMod {
 		PipeManager.registerPipePluggable(RobotStationPluggable.class, "robotStation");
 		EntityRegistry.registerModEntity(EntityRobot.class, "bcRobot", EntityIds.ROBOT, instance, 50, 1, true);
 
+		CoreProxy.proxy.registerTileEntity(TileZonePlan.class, "net.minecraft.src.buildcraft.commander.TileZonePlan");
+		CoreProxy.proxy.registerTileEntity(TileRequester.class, "net.minecraft.src.buildcraft.commander.TileRequester");
+
 		RobotManager.registryProvider = new RobotRegistryProvider();
 
 		RobotManager.registerAIRobot(AIRobotMain.class, "aiRobotMain", "buildcraft.core.robots.AIRobotMain");
@@ -372,6 +383,13 @@ public class BuildCraftRobotics extends BuildCraftMod {
 		BuildcraftRecipeRegistry.integrationTable.addRecipe(new RobotIntegrationRecipe("buildcraft:robotIntegration"));
 	}
 
+	@SubscribeEvent
+	@SideOnly(Side.CLIENT)
+	public void textureHook(TextureStitchEvent.Pre event) {
+		if (event.map.getTextureType() == 1) {
+			RedstoneBoardRegistry.instance.registerIcons(event.map);
+		}
+	}
 
 	@Mod.EventHandler
 	public void serverUnload(FMLServerStoppingEvent event) {

common/buildcraft/BuildCraftSilicon.java

@@ -14,7 +14,6 @@ import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.Achievement;
-
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
@@ -22,29 +21,25 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
-
 import net.minecraftforge.oredict.OreDictionary;
-
 import buildcraft.api.blueprints.BuilderAPI;
 import buildcraft.api.recipes.BuildcraftRecipeRegistry;
 import buildcraft.api.robots.RobotManager;
-import buildcraft.builders.schematics.SchematicRotateMeta;
+import buildcraft.core.builders.schematics.SchematicRotateMeta;
-import buildcraft.robotics.TileRequester;
-import buildcraft.robotics.TileZonePlan;
 import buildcraft.core.CompatHooks;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.InterModComms;
-import buildcraft.core.lib.items.ItemBuildCraft;
 import buildcraft.core.Version;
+import buildcraft.core.lib.items.ItemBuildCraft;
 import buildcraft.core.lib.network.ChannelHandler;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.silicon.BlockLaser;
 import buildcraft.silicon.BlockLaserTable;
-import buildcraft.silicon.SiliconGuiHandler;
 import buildcraft.silicon.ItemLaserTable;
 import buildcraft.silicon.ItemRedstoneChipset;
 import buildcraft.silicon.ItemRedstoneChipset.Chipset;
 import buildcraft.silicon.ResourceIdAssemblyTable;
+import buildcraft.silicon.SiliconGuiHandler;
 import buildcraft.silicon.SiliconProxy;
 import buildcraft.silicon.TileAdvancedCraftingTable;
 import buildcraft.silicon.TileAssemblyTable;
@@ -111,8 +106,6 @@ public class BuildCraftSilicon extends BuildCraftMod {
                 "net.minecraft.src.buildcraft.factory.TileChargingTable");
 		CoreProxy.proxy.registerTileEntity(TileProgrammingTable.class,
 				"net.minecraft.src.buildcraft.factory.TileProgrammingTable");
-		CoreProxy.proxy.registerTileEntity(TileZonePlan.class, "net.minecraft.src.buildcraft.commander.TileZonePlan");
-		CoreProxy.proxy.registerTileEntity(TileRequester.class, "net.minecraft.src.buildcraft.commander.TileRequester");
 
 		BuilderAPI.schematicRegistry.registerSchematicBlock(laserBlock, SchematicRotateMeta.class, new int[] {2, 5, 3, 4}, true);
 

common/buildcraft/BuildCraftTransport.java

@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -22,7 +21,6 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemMinecart;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.WorldServer;
-
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -38,14 +36,11 @@ import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
-
 import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Property;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.oredict.RecipeSorter;
 import net.minecraftforge.oredict.ShapedOreRecipe;
-
 import buildcraft.api.blueprints.BuilderAPI;
 import buildcraft.api.core.BCLog;
 import buildcraft.api.core.EnumColor;
@@ -60,21 +55,20 @@ import buildcraft.api.statements.ITriggerInternal;
 import buildcraft.api.statements.StatementManager;
 import buildcraft.api.transport.PipeManager;
 import buildcraft.api.transport.PipeWire;
-import buildcraft.core.CompatHooks;
 import buildcraft.core.BCCreativeTab;
+import buildcraft.core.CompatHooks;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.InterModComms;
-import buildcraft.core.lib.items.ItemBuildCraft;
 import buildcraft.core.PowerMode;
 import buildcraft.core.Version;
+import buildcraft.core.lib.items.ItemBuildCraft;
 import buildcraft.core.lib.network.ChannelHandler;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.lib.utils.ColorUtils;
+import buildcraft.core.proxy.CoreProxy;
 import buildcraft.silicon.ItemRedstoneChipset.Chipset;
 import buildcraft.transport.BlockFilteredBuffer;
 import buildcraft.transport.BlockGenericPipe;
 import buildcraft.transport.FacadePluggable;
-import buildcraft.transport.TransportGuiHandler;
 import buildcraft.transport.IMCHandlerTransport;
 import buildcraft.transport.ItemFacade;
 import buildcraft.transport.ItemGateCopier;
@@ -87,6 +81,7 @@ import buildcraft.transport.PipeIconProvider;
 import buildcraft.transport.PipeTriggerProvider;
 import buildcraft.transport.TileFilteredBuffer;
 import buildcraft.transport.TileGenericPipe;
+import buildcraft.transport.TransportGuiHandler;
 import buildcraft.transport.TransportProxy;
 import buildcraft.transport.WireIconProvider;
 import buildcraft.transport.gates.GateDefinition.GateLogic;

common/buildcraft/builders/BlockArchitect.java

@@ -15,9 +15,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.BuildCraftBuilders;
 import buildcraft.core.BlockBuildCraftLED;
 import buildcraft.core.GuiIds;

common/buildcraft/builders/BlockBlueprintLibrary.java

@@ -9,21 +9,13 @@
 package buildcraft.builders;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 import buildcraft.BuildCraftBuilders;
-import buildcraft.api.events.BlockInteractionEvent;
-import buildcraft.core.lib.block.BlockBuildCraft;
 import buildcraft.core.BCCreativeTab;
 import buildcraft.core.GuiIds;
+import buildcraft.core.lib.block.BlockBuildCraft;
 
 public class BlockBlueprintLibrary extends BlockBuildCraft {
     public BlockBlueprintLibrary() {

common/buildcraft/builders/BlockBuilder.java

@@ -8,32 +8,19 @@
  */
 package buildcraft.builders;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.BuildCraftBuilders;
-import buildcraft.api.events.BlockInteractionEvent;
-import buildcraft.api.tools.IToolWrench;
-import buildcraft.core.lib.block.BlockBuildCraft;
 import buildcraft.core.BCCreativeTab;
 import buildcraft.core.GuiIds;
+import buildcraft.core.lib.block.BlockBuildCraft;
 import buildcraft.core.lib.fluids.TankUtils;
-import buildcraft.core.lib.utils.Utils;
 
 public class BlockBuilder extends BlockBuildCraft {
 

common/buildcraft/builders/BlockConstructionMarker.java

@@ -9,7 +9,6 @@
 package buildcraft.builders;
 
 import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -17,12 +16,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import buildcraft.api.events.BlockInteractionEvent;
 import buildcraft.core.lib.utils.Utils;
 
 public class BlockConstructionMarker extends BlockMarker {

common/buildcraft/builders/BlockFiller.java

@@ -14,12 +14,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.BuildCraftBuilders;
-import buildcraft.core.BlockBuildCraftLED;
 import buildcraft.core.BCCreativeTab;
+import buildcraft.core.BlockBuildCraftLED;
 import buildcraft.core.GuiIds;
 
 public class BlockFiller extends BlockBuildCraftLED {

common/buildcraft/builders/BlockMarker.java

@@ -10,25 +10,16 @@ package buildcraft.builders;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.BuildCraftCore;
-import buildcraft.api.events.BlockInteractionEvent;
 import buildcraft.api.items.IMapLocation;
-import buildcraft.core.lib.block.BlockBuildCraft;
 import buildcraft.core.BCCreativeTab;
-import buildcraft.core.lib.utils.Utils;
+import buildcraft.core.lib.block.BlockBuildCraft;
 
 public class BlockMarker extends BlockBuildCraft {
 

common/buildcraft/builders/BlockPathMarker.java

@@ -8,18 +8,14 @@
  */
 package buildcraft.builders;
 
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-import buildcraft.core.lib.utils.Utils;
-
 public class BlockPathMarker extends BlockMarker {
 
 	private IIcon activeMarker;

common/buildcraft/builders/BlueprintServerDatabase.java

@@ -1,14 +1,5 @@
 package buildcraft.builders;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import net.minecraft.nbt.NBTTagCompound;
-import buildcraft.api.core.BCLog;
-import buildcraft.core.blueprints.BlueprintBase;
-import buildcraft.core.blueprints.LibraryId;
-import buildcraft.core.lib.utils.NBTUtils;
-
 public class BlueprintServerDatabase extends LibraryDatabase {
 
 }

common/buildcraft/builders/BuilderProxyClient.java

@@ -9,7 +9,6 @@
 package buildcraft.builders;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
-
 import buildcraft.builders.urbanism.TileUrbanist;
 import buildcraft.core.render.RenderBoxProvider;
 import buildcraft.core.render.RenderBuilder;

common/buildcraft/builders/BuildersGuiHandler.java

@@ -11,9 +11,7 @@ package buildcraft.builders;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-
 import cpw.mods.fml.common.network.IGuiHandler;
-
 import buildcraft.builders.gui.ContainerArchitect;
 import buildcraft.builders.gui.ContainerBlueprintLibrary;
 import buildcraft.builders.gui.ContainerBuilder;

common/buildcraft/builders/EventHandlerBuilders.java

@@ -11,7 +11,6 @@ package buildcraft.builders;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
-
 import net.minecraftforge.event.world.WorldEvent;
 
 public class EventHandlerBuilders {

common/buildcraft/builders/HeuristicBlockDetection.java

@@ -2,17 +2,14 @@ package buildcraft.builders;
 
 import java.util.BitSet;
 import java.util.Iterator;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
-
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidBlock;
-
 import buildcraft.api.blueprints.SchematicBlock;
 import buildcraft.api.blueprints.SchematicFluid;
-import buildcraft.builders.schematics.SchematicBlockCreative;
+import buildcraft.core.builders.schematics.SchematicBlockCreative;
-import buildcraft.builders.schematics.SchematicTileCreative;
+import buildcraft.core.builders.schematics.SchematicTileCreative;
 import buildcraft.core.blueprints.SchematicRegistry;
 
 public final class HeuristicBlockDetection {

common/buildcraft/builders/ItemBlueprint.java

@@ -9,22 +9,19 @@
 package buildcraft.builders;
 
 import java.util.List;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
-
 import buildcraft.BuildCraftBuilders;
 import buildcraft.api.blueprints.BuildingPermission;
 import buildcraft.api.items.IBlueprintItem;
-import buildcraft.api.items.INamedItem;
-import buildcraft.core.blueprints.Blueprint;
-import buildcraft.core.blueprints.LibraryId;
 import buildcraft.core.BCCreativeTab;
+import buildcraft.core.blueprints.Blueprint;
+import buildcraft.core.blueprints.BlueprintBase;
+import buildcraft.core.blueprints.LibraryId;
 import buildcraft.core.blueprints.Template;
 import buildcraft.core.lib.items.ItemBuildCraft;
-import buildcraft.core.blueprints.BlueprintBase;
 import buildcraft.core.lib.utils.NBTUtils;
 import buildcraft.core.lib.utils.StringUtils;
 

common/buildcraft/builders/ItemConstructionMarker.java

@@ -17,10 +17,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import buildcraft.api.core.Position;
 import buildcraft.core.lib.utils.NBTUtils;
 

common/buildcraft/builders/LibraryDatabase.java

@@ -18,27 +18,21 @@ import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Set;
 import java.util.TreeSet;
-
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTSizeTracker;
 import net.minecraft.nbt.NBTTagCompound;
-
-import buildcraft.BuildCraftBuilders;
 import buildcraft.api.core.BCLog;
 import buildcraft.api.library.LibraryAPI;
 import buildcraft.core.blueprints.LibraryId;
-import buildcraft.core.blueprints.BlueprintBase;
 import buildcraft.core.lib.utils.NBTUtils;
 
 public class LibraryDatabase {
 	private static final int PAGE_SIZE = 12;
 
-	private File outputDir;
-	private File[] inputDirs;
-
 	protected Set<LibraryId> blueprintIds;
 	protected LibraryId[] pages = new LibraryId[0];
 
+	private File outputDir;
+	private File[] inputDirs;
+
 	/**
 	 * Initialize the blueprint database.
 	 *

common/buildcraft/builders/RenderArchitect.java

@@ -9,10 +9,8 @@
 package buildcraft.builders;
 
 import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.tileentity.TileEntity;
-
 import buildcraft.core.EntityLaser;
 import buildcraft.core.LaserData;
 import buildcraft.core.render.RenderBoxProvider;

common/buildcraft/builders/RenderConstructionMarker.java

@@ -9,7 +9,6 @@
 package buildcraft.builders;
 
 import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.entity.RenderItem;
@@ -18,7 +17,6 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-
 import buildcraft.core.EntityLaser;
 import buildcraft.core.render.RenderBoxProvider;
 import buildcraft.core.render.RenderBuildingItems;

common/buildcraft/builders/RenderPathMarker.java

@@ -9,13 +9,11 @@
 package buildcraft.builders;
 
 import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
-
 import buildcraft.core.EntityLaser;
 import buildcraft.core.LaserData;
 import buildcraft.core.render.RenderLaser;

common/buildcraft/builders/TileArchitect.java

@@ -10,9 +10,7 @@ package buildcraft.builders;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
-
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -20,11 +18,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
-
 import cpw.mods.fml.relauncher.Side;
-
 import net.minecraftforge.common.util.Constants;
-
 import buildcraft.BuildCraftCore;
 import buildcraft.api.core.BlockIndex;
 import buildcraft.api.core.IAreaProvider;
@@ -34,8 +29,8 @@ import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;
 import buildcraft.core.IBoxProvider;
 import buildcraft.core.LaserData;
-import buildcraft.core.lib.block.TileBuildCraft;
 import buildcraft.core.blueprints.BlueprintReadConfiguration;
+import buildcraft.core.lib.block.TileBuildCraft;
 import buildcraft.core.lib.inventory.SimpleInventory;
 import buildcraft.core.lib.network.Packet;
 import buildcraft.core.lib.network.command.CommandWriter;

common/buildcraft/builders/TileBlueprintLibrary.java

@@ -10,25 +10,20 @@ package buildcraft.builders;
 
 import java.io.IOException;
 import java.util.ArrayList;
-
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTSizeTracker;
 import net.minecraft.nbt.NBTTagCompound;
-
 import cpw.mods.fml.relauncher.Side;
-
 import buildcraft.BuildCraftBuilders;
 import buildcraft.BuildCraftCore;
 import buildcraft.api.library.ILibraryTypeHandler;
 import buildcraft.api.library.LibraryAPI;
 import buildcraft.core.blueprints.LibraryId;
 import buildcraft.core.lib.block.TileBuildCraft;
-import buildcraft.core.blueprints.BlueprintBase;
 import buildcraft.core.lib.inventory.SimpleInventory;
 import buildcraft.core.lib.network.command.CommandWriter;
 import buildcraft.core.lib.network.command.ICommandReceiver;

common/buildcraft/builders/TileBuilder.java

@@ -12,9 +12,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
-
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -22,9 +20,7 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.WorldSettings.GameType;
-
 import cpw.mods.fml.relauncher.Side;
-
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
@@ -32,7 +28,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
-
 import buildcraft.BuildCraftBuilders;
 import buildcraft.BuildCraftCore;
 import buildcraft.api.core.BlockIndex;
@@ -40,6 +35,7 @@ import buildcraft.api.core.IInvSlot;
 import buildcraft.api.core.Position;
 import buildcraft.api.robots.EntityRobotBase;
 import buildcraft.api.robots.IRequestProvider;
+import buildcraft.api.robots.ResourceIdRequest;
 import buildcraft.api.robots.RobotManager;
 import buildcraft.api.robots.StackRequest;
 import buildcraft.api.tiles.IControllable;
@@ -66,7 +62,6 @@ import buildcraft.core.lib.network.Packet;
 import buildcraft.core.lib.network.command.CommandWriter;
 import buildcraft.core.lib.network.command.PacketCommand;
 import buildcraft.core.lib.utils.NetworkUtils;
-import buildcraft.api.robots.ResourceIdRequest;
 
 public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluidHandler, IRequestProvider, IControllable {
 

common/buildcraft/builders/TileConstructionMarker.java

@@ -10,25 +10,19 @@ package buildcraft.builders;
 
 import java.util.ArrayList;
 import java.util.HashSet;
-
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
-
 import cpw.mods.fml.relauncher.Side;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.BuildCraftCore;
 import buildcraft.api.core.Position;
 import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;
 import buildcraft.core.IBoxProvider;
 import buildcraft.core.LaserData;
-import buildcraft.core.lib.block.TileBuildCraft;
 import buildcraft.core.blueprints.Blueprint;
 import buildcraft.core.blueprints.BlueprintBase;
 import buildcraft.core.blueprints.BptBuilderBase;
@@ -36,6 +30,7 @@ import buildcraft.core.blueprints.BptBuilderBlueprint;
 import buildcraft.core.blueprints.BptContext;
 import buildcraft.core.builders.BuildingItem;
 import buildcraft.core.builders.IBuildingItemsProvider;
+import buildcraft.core.lib.block.TileBuildCraft;
 import buildcraft.core.lib.network.Packet;
 import buildcraft.core.lib.network.command.CommandWriter;
 import buildcraft.core.lib.network.command.ICommandReceiver;

common/buildcraft/builders/TileFiller.java

@@ -9,15 +9,12 @@
 package buildcraft.builders;
 
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
-
 import cpw.mods.fml.relauncher.Side;
-
 import buildcraft.BuildCraftCore;
 import buildcraft.api.core.IAreaProvider;
 import buildcraft.api.filler.FillerManager;

common/buildcraft/builders/TileMarker.java

@@ -9,23 +9,20 @@
 package buildcraft.builders;
 
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-
 import buildcraft.BuildCraftBuilders;
-import buildcraft.api.core.IAreaProvider;
 import buildcraft.api.core.ISerializable;
 import buildcraft.api.core.Position;
 import buildcraft.api.tiles.ITileAreaProvider;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.lib.EntityBlock;
 import buildcraft.core.LaserKind;
+import buildcraft.core.lib.EntityBlock;
 import buildcraft.core.lib.block.TileBuildCraft;
-import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.lib.utils.Utils;
+import buildcraft.core.proxy.CoreProxy;
 
 public class TileMarker extends TileBuildCraft implements ITileAreaProvider {
 	public static class TileWrapper implements ISerializable {

common/buildcraft/builders/TilePathMarker.java

@@ -11,16 +11,13 @@ package buildcraft.builders;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
-
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-
 import buildcraft.api.core.BlockIndex;
-import buildcraft.api.core.Position;
 import buildcraft.api.core.IPathProvider;
+import buildcraft.api.core.Position;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.LaserData;
 

common/buildcraft/builders/blueprints/RealBlueprintDeployer.java

@@ -9,19 +9,16 @@
 package buildcraft.builders.blueprints;
 
 import java.io.File;
-
 import net.minecraft.world.World;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.api.blueprints.BlueprintDeployer;
 import buildcraft.api.blueprints.Translation;
 import buildcraft.builders.LibraryDatabase;
-import buildcraft.core.blueprints.BlueprintBase;
-import buildcraft.core.blueprints.LibraryId;
 import buildcraft.core.blueprints.Blueprint;
+import buildcraft.core.blueprints.BlueprintBase;
 import buildcraft.core.blueprints.BptBuilderBlueprint;
 import buildcraft.core.blueprints.BptContext;
+import buildcraft.core.blueprints.LibraryId;
 import buildcraft.core.lib.utils.NBTUtils;
 
 public class RealBlueprintDeployer extends BlueprintDeployer {

common/buildcraft/builders/blueprints/RecursiveBlueprintBuilder.java

@@ -9,12 +9,9 @@
 package buildcraft.builders.blueprints;
 
 import java.util.ArrayList;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.core.Box;
 import buildcraft.core.blueprints.Blueprint;
 import buildcraft.core.blueprints.BlueprintBase;

common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java

@@ -11,9 +11,7 @@ package buildcraft.builders.blueprints;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.BuildCraftBuilders;
 import buildcraft.api.blueprints.Translation;
 import buildcraft.api.core.BlockIndex;
@@ -23,11 +21,11 @@ import buildcraft.builders.ItemBlueprintTemplate;
 import buildcraft.builders.TileArchitect;
 import buildcraft.builders.TileBuilder;
 import buildcraft.builders.TileConstructionMarker;
-import buildcraft.core.lib.utils.BlockScanner;
 import buildcraft.core.blueprints.Blueprint;
 import buildcraft.core.blueprints.BlueprintBase;
 import buildcraft.core.blueprints.BptContext;
 import buildcraft.core.blueprints.Template;
+import buildcraft.core.lib.utils.BlockScanner;
 
 public class RecursiveBlueprintReader {
 

common/buildcraft/builders/gui/ContainerArchitect.java

@@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
-
 import buildcraft.builders.TileArchitect;
 import buildcraft.core.lib.gui.BuildCraftContainer;
 import buildcraft.core.lib.gui.slots.SlotOutput;

common/buildcraft/builders/gui/ContainerBlueprintLibrary.java

@@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
-
 import buildcraft.builders.TileBlueprintLibrary;
 import buildcraft.core.lib.gui.BuildCraftContainer;
 import buildcraft.core.lib.gui.slots.SlotOutput;

common/buildcraft/builders/gui/ContainerBuilder.java

@@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
-
 import buildcraft.builders.TileBuilder;
 import buildcraft.core.lib.gui.BuildCraftContainer;
 

common/buildcraft/builders/gui/ContainerFiller.java

@@ -12,10 +12,8 @@ import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import buildcraft.builders.TileFiller;
 import buildcraft.core.lib.gui.BuildCraftContainer;
 import buildcraft.core.lib.gui.GuiBuildCraft;

common/buildcraft/builders/gui/GuiArchitect.java

@@ -10,14 +10,11 @@ package buildcraft.builders.gui;
 
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
-
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
-
 import buildcraft.BuildCraftCore;
 import buildcraft.builders.TileArchitect;
 import buildcraft.core.DefaultProps;

common/buildcraft/builders/gui/GuiBlueprintLibrary.java

@@ -9,11 +9,9 @@
 package buildcraft.builders.gui;
 
 import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
-
 import buildcraft.BuildCraftBuilders;
 import buildcraft.api.library.LibraryAPI;
 import buildcraft.builders.TileBlueprintLibrary;

common/buildcraft/builders/gui/GuiBuilder.java

@@ -9,20 +9,15 @@
 package buildcraft.builders.gui;
 
 import java.util.Collection;
-
 import org.lwjgl.opengl.GL11;
-
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-
 import buildcraft.BuildCraftCore;
 import buildcraft.builders.TileBuilder;
-import buildcraft.core.DefaultProps;
 import buildcraft.core.lib.fluids.Tank;
 import buildcraft.core.lib.gui.AdvancedSlot;
 import buildcraft.core.lib.gui.GuiAdvancedInterface;

common/buildcraft/builders/gui/GuiFiller.java

@@ -11,13 +11,11 @@ package buildcraft.builders.gui;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.util.ResourceLocation;
-
 import buildcraft.api.filler.FillerManager;
 import buildcraft.api.statements.IStatement;
 import buildcraft.api.statements.IStatementParameter;
 import buildcraft.api.statements.StatementMouseClick;
 import buildcraft.builders.TileFiller;
-import buildcraft.core.DefaultProps;
 import buildcraft.core.builders.patterns.FillerPattern;
 import buildcraft.core.lib.gui.AdvancedSlot;
 import buildcraft.core.lib.gui.GuiAdvancedInterface;

common/buildcraft/builders/gui/SlotArchitect.java

@@ -10,7 +10,6 @@ package buildcraft.builders.gui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
-
 import buildcraft.builders.TileArchitect;
 import buildcraft.core.lib.gui.slots.SlotBase;
 

common/buildcraft/builders/gui/SlotBlueprintLibrary.java

@@ -10,7 +10,6 @@ package buildcraft.builders.gui;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
-
 import buildcraft.builders.TileBlueprintLibrary;
 import buildcraft.core.lib.gui.slots.SlotBase;
 

common/buildcraft/builders/schematics/SchematicAir.java

@@ -1,9 +1,7 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicBed.java

@@ -9,10 +9,8 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicCactus.java

@@ -9,10 +9,8 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicCustomStack.java

@@ -9,9 +9,7 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicDirt.java

@@ -9,11 +9,9 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicDoor.java

@@ -9,10 +9,8 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.MappingRegistry;
 import buildcraft.api.blueprints.SchematicBlock;

common/buildcraft/builders/schematics/SchematicEnderChest.java

@@ -9,12 +9,11 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
+import buildcraft.core.builders.schematics.SchematicRotateMeta;
 
 public class SchematicEnderChest extends SchematicRotateMeta {
 

common/buildcraft/builders/schematics/SchematicFactoryBlock.java

@@ -11,7 +11,6 @@ package buildcraft.builders.schematics;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.nbt.NBTTagCompound;
-
 import buildcraft.api.blueprints.MappingNotFoundException;
 import buildcraft.api.blueprints.MappingRegistry;
 import buildcraft.api.blueprints.SchematicBlock;

common/buildcraft/builders/schematics/SchematicFactoryEntity.java

@@ -9,7 +9,6 @@
 package buildcraft.builders.schematics;
 
 import net.minecraft.nbt.NBTTagCompound;
-
 import buildcraft.api.blueprints.MappingNotFoundException;
 import buildcraft.api.blueprints.MappingRegistry;
 import buildcraft.api.blueprints.SchematicEntity;

common/buildcraft/builders/schematics/SchematicFactoryMask.java

@@ -9,7 +9,6 @@
 package buildcraft.builders.schematics;
 
 import net.minecraft.nbt.NBTTagCompound;
-
 import buildcraft.api.blueprints.MappingRegistry;
 import buildcraft.api.blueprints.SchematicFactory;
 import buildcraft.api.blueprints.SchematicMask;

common/buildcraft/builders/schematics/SchematicFarmland.java

@@ -9,11 +9,9 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicFire.java

@@ -9,10 +9,8 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicGlassPane.java

@@ -9,9 +9,7 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicGravel.java

@@ -9,11 +9,9 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicHanging.java

@@ -14,7 +14,6 @@ import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicEntity;
 import buildcraft.api.blueprints.Translation;

common/buildcraft/builders/schematics/SchematicLever.java

@@ -9,9 +9,9 @@
 package buildcraft.builders.schematics;
 
 import buildcraft.api.blueprints.IBuilderContext;
+import buildcraft.core.builders.schematics.SchematicWallSide;
 
 public class SchematicLever extends SchematicWallSide {
-
 	@Override
 	public void rotateLeft(IBuilderContext context) {
 		int status = meta & 8;
@@ -19,6 +19,5 @@ public class SchematicLever extends SchematicWallSide {
 		meta -= status;
 		super.rotateLeft(context);
 		meta += status;
-
 	}
 }

common/buildcraft/builders/schematics/SchematicMinecart.java

@@ -13,7 +13,6 @@ import net.minecraft.entity.item.EntityMinecart;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagList;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicEntity;
 import buildcraft.api.blueprints.Translation;

common/buildcraft/builders/schematics/SchematicPiston.java

@@ -9,10 +9,9 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
+import buildcraft.core.builders.schematics.SchematicRotateMeta;
 
 public class SchematicPiston extends SchematicRotateMeta {
 

common/buildcraft/builders/schematics/SchematicPortal.java

@@ -9,10 +9,8 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicPumpkin.java

@@ -9,9 +9,7 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicRail.java

@@ -9,9 +9,7 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicRedstoneDiode.java

@@ -9,10 +9,8 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicRedstoneLamp.java

@@ -9,11 +9,9 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicRedstoneWire.java

@@ -9,9 +9,7 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicSeeds.java

@@ -9,10 +9,8 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicSign.java

@@ -9,12 +9,9 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicTile;
 

common/buildcraft/builders/schematics/SchematicStairs.java

@@ -9,9 +9,7 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicStone.java

@@ -9,11 +9,9 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/schematics/SchematicTripWireHook.java

@@ -9,9 +9,7 @@
 package buildcraft.builders.schematics;
 
 import java.util.LinkedList;
-
 import net.minecraft.item.ItemStack;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
 

common/buildcraft/builders/statements/ActionFiller.java

@@ -10,9 +10,7 @@ package buildcraft.builders.statements;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.api.statements.IActionExternal;
 import buildcraft.api.statements.IStatementContainer;
 import buildcraft.api.statements.IStatementParameter;

common/buildcraft/builders/statements/BuildersActionProvider.java

@@ -11,11 +11,8 @@ package buildcraft.builders.statements;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedList;
-
 import net.minecraft.tileentity.TileEntity;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.api.filler.FillerManager;
 import buildcraft.api.filler.IFillerPattern;
 import buildcraft.api.statements.IActionExternal;

common/buildcraft/builders/urbanism/AnchoredBox.java

@@ -9,9 +9,7 @@
 package buildcraft.builders.urbanism;
 
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.nbt.NBTTagCompound;
-
 import buildcraft.api.core.ISerializable;
 import buildcraft.core.Box;
 

common/buildcraft/builders/urbanism/BlockUrbanist.java

@@ -13,15 +13,12 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-
 import cpw.mods.fml.common.FMLCommonHandler;
-
 import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.BuildCraftBuilders;
 import buildcraft.api.events.BlockInteractionEvent;
-import buildcraft.core.lib.block.BlockBuildCraft;
 import buildcraft.core.GuiIds;
+import buildcraft.core.lib.block.BlockBuildCraft;
 
 public class BlockUrbanist extends BlockBuildCraft {
 

common/buildcraft/builders/urbanism/ContainerUrbanist.java

@@ -10,7 +10,6 @@ package buildcraft.builders.urbanism;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
-
 import buildcraft.core.lib.gui.BuildCraftContainer;
 
 public class ContainerUrbanist extends BuildCraftContainer {

common/buildcraft/builders/urbanism/EntityUrbanist.java

@@ -12,9 +12,7 @@ import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
-
 import org.lwjgl.input.Keyboard;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.entity.EntityLivingBase;
@@ -22,7 +20,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-
 import buildcraft.BuildCraftCore;
 
 public class EntityUrbanist extends EntityLivingBase {

common/buildcraft/builders/urbanism/GuiUrbanist.java

@@ -10,15 +10,11 @@ package buildcraft.builders.urbanism;
 
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
-
 import net.minecraft.inventory.IInventory;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
-import buildcraft.core.DefaultProps;
 import buildcraft.core.lib.gui.AdvancedSlot;
 import buildcraft.core.lib.gui.GuiAdvancedInterface;
 

common/buildcraft/builders/urbanism/TileUrbanist.java

@@ -9,9 +9,7 @@
 package buildcraft.builders.urbanism;
 
 import java.util.ArrayList;
-
 import io.netty.buffer.ByteBuf;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -20,9 +18,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
-
 import cpw.mods.fml.relauncher.Side;
-
 import buildcraft.BuildCraftCore;
 import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;

common/buildcraft/builders/urbanism/UrbanistTool.java

@@ -9,10 +9,8 @@
 package buildcraft.builders.urbanism;
 
 import java.util.ArrayList;
-
 import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
-
 import buildcraft.core.lib.gui.AdvancedSlot;
 
 class UrbanistTool {

common/buildcraft/builders/urbanism/UrbanistToolArea.java

@@ -9,7 +9,6 @@
 package buildcraft.builders.urbanism;
 
 import org.lwjgl.input.Mouse;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;

common/buildcraft/builders/urbanism/UrbanistToolBlock.java

@@ -12,8 +12,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 
-import buildcraft.core.DefaultProps;
-
 class UrbanistToolBlock extends UrbanistTool {
 
 	private static final ResourceLocation GUI_TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/urbanist_tool_place_block.png");

common/buildcraft/builders/urbanism/UrbanistToolFiller.java

@@ -10,18 +10,14 @@ package buildcraft.builders.urbanism;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import buildcraft.api.filler.IFillerPattern;
 import buildcraft.core.Box;
-import buildcraft.core.DefaultProps;
 import buildcraft.core.builders.patterns.FillerPattern;
 import buildcraft.core.lib.gui.AdvancedSlot;
 import buildcraft.core.lib.gui.GuiAdvancedInterface;

common/buildcraft/builders/urbanism/UrbanistToolsIconProvider.java

@@ -10,10 +10,8 @@ package buildcraft.builders.urbanism;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import buildcraft.api.core.IIconProvider;
 
 public final class UrbanistToolsIconProvider implements IIconProvider {

common/buildcraft/core/BCCreativeTab.java

@@ -10,7 +10,6 @@ package buildcraft.core;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;

common/buildcraft/core/BlockBuildCraftLED.java

@@ -5,12 +5,8 @@ import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.common.util.ForgeDirection;
-import buildcraft.BuildCraftCore;
-import buildcraft.api.transport.IPipeTile;
 import buildcraft.core.lib.block.BlockBuildCraft;
 import buildcraft.core.lib.utils.ResourceUtils;
-import buildcraft.core.lib.utils.Utils;
 
 public abstract class BlockBuildCraftLED extends BlockBuildCraft {
 	private IIcon[] led;

common/buildcraft/core/BlockBuildTool.java

@@ -10,11 +10,7 @@ package buildcraft.core;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import buildcraft.BuildCraftCore;
 
 public class BlockBuildTool extends Block {

common/buildcraft/core/BlockSpring.java

@@ -10,7 +10,6 @@ package buildcraft.core;
 
 import java.util.List;
 import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -19,7 +18,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;