BuildCraft 7.0.1 Beta

api/buildcraft/api/tablet/TabletAPI.java

@@ -3,13 +3,13 @@ package buildcraft.api.tablet;
 import java.util.HashMap;
 import java.util.Map;
 
-public class TabletAPI {
+public final class TabletAPI {
+	private static final Map<String, TabletProgramFactory> programs = new HashMap<String, TabletProgramFactory>();
+
 	private TabletAPI() {
 
 	}
 
-	private static final Map<String, TabletProgramFactory> programs = new HashMap<String, TabletProgramFactory>();
-
 	public static void registerProgram(TabletProgramFactory factory) {
 		programs.put(factory.getName(), factory);
 	}

api/buildcraft/api/tablet/TabletBitmap.java

@@ -41,13 +41,13 @@ public class TabletBitmap {
 				if (h >= width) {
 					break;
 				}
+
 				set(x + h, y + i, bitmap.get(h, i));
 			}
 		}
 	}
 
-	@Override
-	public TabletBitmap clone() {
+	public TabletBitmap duplicate() {
 		TabletBitmap cloned = new TabletBitmap(this.width, this.height);
 		cloned.data = this.data.clone();
 		return cloned;

api/buildcraft/api/tablet/TabletProgramFactory.java

@@ -1,8 +1,5 @@
 package buildcraft.api.tablet;
 
-import net.minecraft.nbt.NBTTagCompound;
-import cpw.mods.fml.relauncher.Side;
-
 public abstract class TabletProgramFactory {
 	/**
 	 * Create an instance of the tablet program specified by this Factory.

buildcraft_resources/changelog/7.0.1

@@ -16,9 +16,20 @@ Additions:
 Improvements:
 * [#2599] Stripes pipes don't move forward when using a non-item pipe (asie)
 * [#2567] Emzuli Pipes support lists now (asie)
+* Improved the new Auto Workbench algorithm (asie)
 * Robot particle frequency is affected by Minecraft graphics settings (asie)
+* Tons of robot improvements and refactors (hea3ven)
 
 Bugfixes:
 * [#2603} Assembly Table crashes without Robotics (asie)
 * [#2602] NPE when comparing two StatementSlots (asie)
+* Error when loading a blueprint with invalid mappings (hea3ven)
 * Fixes to Fancy pipe connection rendering (asie)
+* Likely some robot bugfixes I don't know of (hea3ven)
+* Not being able to set blueprints to the construction markers (hea3ven)
+* Pump client-side entity spam (asie)
+
+Breaking changes:
+* Quarries are now part of Builders, not Factory.
+* Robots can now only provide items and fluids from wooden/emerald pipes.
+* The config file's name is different - it's main.cfg now - and we can't promise the config format not changing further as we go.

common/buildcraft/BuildCraftBuilders.java

@@ -103,7 +103,6 @@ import buildcraft.builders.schematics.SchematicFactoryEntity;
 import buildcraft.builders.schematics.SchematicFactoryMask;
 import buildcraft.builders.schematics.SchematicFarmland;
 import buildcraft.builders.schematics.SchematicFire;
-import buildcraft.core.builders.schematics.SchematicFree;
 import buildcraft.builders.schematics.SchematicGlassPane;
 import buildcraft.builders.schematics.SchematicGravel;
 import buildcraft.builders.schematics.SchematicHanging;
@@ -144,6 +143,7 @@ import buildcraft.core.builders.patterns.PatternParameterYDir;
 import buildcraft.core.builders.patterns.PatternPyramid;
 import buildcraft.core.builders.patterns.PatternStairs;
 import buildcraft.core.builders.schematics.SchematicBlockCreative;
+import buildcraft.core.builders.schematics.SchematicFree;
 import buildcraft.core.builders.schematics.SchematicIgnore;
 import buildcraft.core.builders.schematics.SchematicRotateMeta;
 import buildcraft.core.builders.schematics.SchematicStandalone;

common/buildcraft/BuildCraftCore.java

@@ -37,7 +37,6 @@ 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.gameevent.PlayerEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -81,8 +80,6 @@ import buildcraft.core.ItemList;
 import buildcraft.core.ItemMapLocation;
 import buildcraft.core.ItemPaintbrush;
 import buildcraft.core.ItemSpring;
-import buildcraft.core.network.PacketHandlerCore;
-import buildcraft.core.tablet.ItemTablet;
 import buildcraft.core.ItemWrench;
 import buildcraft.core.SchematicEngine;
 import buildcraft.core.SpringPopulate;
@@ -95,9 +92,9 @@ import buildcraft.core.config.ConfigManager;
 import buildcraft.core.lib.engines.ItemEngine;
 import buildcraft.core.lib.engines.TileEngineBase;
 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.network.PacketHandlerCore;
 import buildcraft.core.properties.WorldPropertyIsDirt;
 import buildcraft.core.properties.WorldPropertyIsFarmland;
 import buildcraft.core.properties.WorldPropertyIsFluidSource;
@@ -126,6 +123,7 @@ import buildcraft.core.statements.TriggerInventory;
 import buildcraft.core.statements.TriggerInventoryLevel;
 import buildcraft.core.statements.TriggerMachine;
 import buildcraft.core.statements.TriggerRedstoneInput;
+import buildcraft.core.tablet.ItemTablet;
 import buildcraft.core.tablet.PacketTabletMessage;
 import buildcraft.core.tablet.TabletProgramMenuFactory;
 import buildcraft.core.tablet.manager.TabletManagerClient;

common/buildcraft/BuildCraftTransport.java

@@ -49,7 +49,6 @@ import buildcraft.api.blueprints.BuilderAPI;
 import buildcraft.api.core.BCLog;
 import buildcraft.api.core.EnumColor;
 import buildcraft.api.core.IIconProvider;
-import buildcraft.api.core.JavaTools;
 import buildcraft.api.facades.FacadeAPI;
 import buildcraft.api.gates.GateExpansions;
 import buildcraft.api.gates.IGateExpansion;

common/buildcraft/builders/TileArchitect.java

@@ -27,9 +27,9 @@ import buildcraft.api.core.Position;
 import buildcraft.builders.blueprints.RecursiveBlueprintReader;
 import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;
-import buildcraft.core.internal.IBoxProvider;
 import buildcraft.core.LaserData;
 import buildcraft.core.blueprints.BlueprintReadConfiguration;
+import buildcraft.core.internal.IBoxProvider;
 import buildcraft.core.lib.block.TileBuildCraft;
 import buildcraft.core.lib.inventory.SimpleInventory;
 import buildcraft.core.lib.network.Packet;

common/buildcraft/builders/TileConstructionMarker.java

@@ -21,7 +21,6 @@ import buildcraft.BuildCraftCore;
 import buildcraft.api.core.Position;
 import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;
-import buildcraft.core.internal.IBoxProvider;
 import buildcraft.core.LaserData;
 import buildcraft.core.blueprints.Blueprint;
 import buildcraft.core.blueprints.BlueprintBase;
@@ -30,6 +29,7 @@ import buildcraft.core.blueprints.BptBuilderBlueprint;
 import buildcraft.core.blueprints.BptContext;
 import buildcraft.core.builders.BuildingItem;
 import buildcraft.core.builders.IBuildingItemsProvider;
+import buildcraft.core.internal.IBoxProvider;
 import buildcraft.core.lib.block.TileBuildCraft;
 import buildcraft.core.lib.network.Packet;
 import buildcraft.core.lib.network.command.CommandWriter;

common/buildcraft/builders/TileQuarry.java

@@ -31,7 +31,6 @@ import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftBuilders;
 import buildcraft.BuildCraftCore;
-import buildcraft.BuildCraftBuilders;
 import buildcraft.api.blueprints.BuilderAPI;
 import buildcraft.api.core.BuildCraftAPI;
 import buildcraft.api.core.IAreaProvider;
@@ -46,12 +45,12 @@ import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;
 import buildcraft.core.CoreConstants;
 import buildcraft.core.DefaultAreaProvider;
-import buildcraft.core.internal.IDropControlInventory;
 import buildcraft.core.blueprints.Blueprint;
 import buildcraft.core.blueprints.BptBuilderBase;
 import buildcraft.core.blueprints.BptBuilderBlueprint;
 import buildcraft.core.builders.TileAbstractBuilder;
 import buildcraft.core.builders.patterns.FillerPattern;
+import buildcraft.core.internal.IDropControlInventory;
 import buildcraft.core.lib.RFBattery;
 import buildcraft.core.lib.utils.BlockMiner;
 import buildcraft.core.lib.utils.BlockUtils;

common/buildcraft/core/builders/TileAbstractBuilder.java

@@ -21,8 +21,8 @@ import net.minecraftforge.fluids.FluidStack;
 import buildcraft.BuildCraftCore;
 import buildcraft.api.blueprints.BuilderAPI;
 import buildcraft.api.blueprints.ITileBuilder;
-import buildcraft.core.internal.IBoxProvider;
 import buildcraft.core.LaserData;
+import buildcraft.core.internal.IBoxProvider;
 import buildcraft.core.lib.RFBattery;
 import buildcraft.core.lib.block.TileBuildCraft;
 import buildcraft.core.lib.network.Packet;

common/buildcraft/core/builders/schematics/SchematicFree.java

@@ -9,8 +9,6 @@
 package buildcraft.core.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/core/config/BCConfigElement.java

@@ -24,8 +24,7 @@ public class BCConfigElement<T> extends ConfigElement<T> {
 	}
 
 	@Override
-	public List<IConfigElement> getChildElements()
-	{
+	public List<IConfigElement> getChildElements() {
 		if (!isProp) {
 			List<IConfigElement> elements = new ArrayList<IConfigElement>();
 			Iterator<ConfigCategory> ccI = cat.getChildren().iterator();
@@ -43,8 +42,7 @@ public class BCConfigElement<T> extends ConfigElement<T> {
 				}
 			}
 
-			while (pI.hasNext())
-			{
+			while (pI.hasNext()) {
 				ConfigElement<?> temp = getTypedElement(pI.next());
 				if (temp.showInGui()) {
 					elements.add(temp);

common/buildcraft/core/lib/utils/Utils.java

@@ -36,10 +36,10 @@ import buildcraft.api.transport.IInjectable;
 import buildcraft.api.transport.IPipeTile;
 import buildcraft.core.CompatHooks;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.internal.IDropControlInventory;
-import buildcraft.core.internal.IFramePipeConnection;
 import buildcraft.core.LaserData;
 import buildcraft.core.LaserKind;
+import buildcraft.core.internal.IDropControlInventory;
+import buildcraft.core.internal.IFramePipeConnection;
 import buildcraft.core.lib.EntityBlock;
 import buildcraft.core.lib.block.TileBuildCraft;
 import buildcraft.core.lib.inventory.ITransactor;

common/buildcraft/core/network/PacketHandlerCore.java

@@ -1,13 +1,11 @@
 package buildcraft.core.network;
 
 import io.netty.channel.ChannelHandlerContext;
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.INetHandler;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
-import buildcraft.BuildCraftCore;
 import buildcraft.core.lib.network.Packet;
 import buildcraft.core.lib.network.PacketHandler;
 import buildcraft.core.proxy.CoreProxy;

common/buildcraft/core/tablet/GuiTablet.java

@@ -29,7 +29,7 @@ public class GuiTablet extends GuiScreen {
 	private final TabletClient tablet;
 	private int guiLeft, guiTop;
 	private long lastDate;
-	private float GL_SCALE = 1.0f;
+	private float glScale = 1.0f;
 	private int buttonState = 1;
 
 	public GuiTablet(EntityPlayer player) {
@@ -59,7 +59,7 @@ public class GuiTablet extends GuiScreen {
 		ScaledResolution currentRes = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
 		mc.gameSettings.guiScale = oldScale;
 
-		GL_SCALE = (float) (currentRes.getScaledWidth_double() / realRes.getScaledWidth_double());
+		glScale = (float) (currentRes.getScaledWidth_double() / realRes.getScaledWidth_double());
 
 		this.guiLeft = (currentRes.getScaledWidth() - X_SIZE) / 2;
 		this.guiTop = (currentRes.getScaledHeight() - Y_SIZE) / 2;
@@ -92,8 +92,8 @@ public class GuiTablet extends GuiScreen {
 
 	@Override
 	public void handleMouseInput() {
-		int x = (int) (Mouse.getEventX() * this.width / this.mc.displayWidth * GL_SCALE);
-		int y = (int) ((this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1) * GL_SCALE);
+		int x = (int) (Mouse.getEventX() * this.width / this.mc.displayWidth * glScale);
+		int y = (int) ((this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1) * glScale);
 		int k = Mouse.getEventButton();
 
 		if (k == 0) {
@@ -124,7 +124,7 @@ public class GuiTablet extends GuiScreen {
 
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		GL11.glPushMatrix();
-		GL11.glScalef(1.0F / GL_SCALE, 1.0F / GL_SCALE, 1.0F / GL_SCALE);
+		GL11.glScalef(1.0F / glScale, 1.0F / glScale, 1.0F / glScale);
 
 		bindTexture(TEXTURE);
 		drawTexturedModalRect(guiLeft, guiTop, 0, 0, X_SIZE, Y_SIZE);

common/buildcraft/core/tablet/ItemTablet.java

@@ -4,10 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import cpw.mods.fml.common.FMLCommonHandler;
-import buildcraft.BuildCraftCore;
-import buildcraft.core.GuiIds;
 import buildcraft.core.lib.items.ItemBuildCraft;
-import buildcraft.core.lib.utils.NBTUtils;
 import buildcraft.core.tablet.manager.TabletManagerServer;
 
 public class ItemTablet extends ItemBuildCraft {

common/buildcraft/core/tablet/TabletBase.java

@@ -2,12 +2,9 @@ package buildcraft.core.tablet;
 
 import java.util.LinkedList;
 import net.minecraft.nbt.NBTTagCompound;
-import cpw.mods.fml.relauncher.Side;
-import buildcraft.BuildCraftCore;
 import buildcraft.api.core.BCLog;
 import buildcraft.api.tablet.ITablet;
 import buildcraft.api.tablet.TabletAPI;
-import buildcraft.api.tablet.TabletBitmap;
 import buildcraft.api.tablet.TabletProgram;
 import buildcraft.api.tablet.TabletProgramFactory;
 

common/buildcraft/core/tablet/TabletClient.java

@@ -1,7 +1,5 @@
 package buildcraft.core.tablet;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.nbt.NBTTagCompound;
 import cpw.mods.fml.relauncher.Side;
 import buildcraft.BuildCraftCore;

common/buildcraft/core/tablet/TabletProgramMenu.java

@@ -1,7 +1,5 @@
 package buildcraft.core.tablet;
 
-import java.util.ArrayList;
-import java.util.List;
 import cpw.mods.fml.relauncher.Side;
 import buildcraft.api.tablet.ITablet;
 import buildcraft.api.tablet.TabletBitmap;
@@ -21,7 +19,7 @@ public class TabletProgramMenu extends TabletProgram {
 	}
 
 	public void tick(float time) {
-		t+=time;
+		t += time;
 		if (!init && t > 2 && tablet.getSide() == Side.CLIENT) {
 			TabletBitmap bitmap = new TabletBitmap(244, 306);
 			try {
@@ -30,10 +28,10 @@ public class TabletProgramMenu extends TabletProgram {
 				TabletDrawUtils.drawRect(bitmap, 4, 4, 236, 280, 7);
 				int hxo = (244 - font.getStringWidth("Page 1")) / 2;
 				font.draw(bitmap, "Page 2/4", hxo, 287, 5);
-				int XO = 8;
+				int xo = 8;
 				int y = 8;
-				int W = 228;
-				String[] lines = TabletTextUtils.split(lorem, font, W, false);
+				int w = 228;
+				String[] lines = TabletTextUtils.split(lorem, font, w, false);
 				for (int i = 0; i < lines.length; i++) {
 					String line = lines[i];
 					String[] words = line.split(" ");
@@ -43,9 +41,9 @@ public class TabletProgramMenu extends TabletProgram {
 						for (String s : words) {
 							widthNoSpaces += font.getStringWidth(s);
 						}
-						justifyValue = (W - widthNoSpaces) / (float) (words.length - 1);
+						justifyValue = (w - widthNoSpaces) / (float) (words.length - 1);
 					}
-					float x = XO;
+					float x = xo;
 					for (String s: words) {
 						x += font.draw(bitmap, s, (int) x, y, 7);
 						x += justifyValue;

common/buildcraft/core/tablet/TabletServer.java

@@ -5,7 +5,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import cpw.mods.fml.relauncher.Side;
 import buildcraft.BuildCraftCore;
 import buildcraft.api.tablet.TabletBitmap;
-import buildcraft.api.tablet.TabletProgram;
 
 public class TabletServer extends TabletBase {
 	protected final EntityPlayer player;

common/buildcraft/core/tablet/manager/TabletThread.java

@@ -1,7 +1,6 @@
 package buildcraft.core.tablet.manager;
 
 import java.util.Date;
-import cpw.mods.fml.relauncher.Side;
 import buildcraft.core.tablet.TabletBase;
 
 public class TabletThread implements Runnable {

common/buildcraft/core/tablet/utils/TabletBitmapLoader.java

@@ -3,7 +3,7 @@ package buildcraft.core.tablet.utils;
 import java.io.InputStream;
 import buildcraft.api.tablet.TabletBitmap;
 
-public class TabletBitmapLoader {
+public final class TabletBitmapLoader {
 	private TabletBitmapLoader() {
 
 	}

common/buildcraft/core/tablet/utils/TabletDrawUtils.java

@@ -2,7 +2,7 @@ package buildcraft.core.tablet.utils;
 
 import buildcraft.api.tablet.TabletBitmap;
 
-public class TabletDrawUtils {
+public final class TabletDrawUtils {
 	private TabletDrawUtils() {
 
 	}

common/buildcraft/core/tablet/utils/TabletFont.java

@@ -1,13 +1,12 @@
 package buildcraft.core.tablet.utils;
 
-import gnu.trove.map.TIntObjectMap;
-import gnu.trove.map.hash.TIntObjectHashMap;
-
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import gnu.trove.map.TIntObjectMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 import buildcraft.api.tablet.TabletBitmap;
 
 public final class TabletFont {
@@ -90,9 +89,9 @@ public final class TabletFont {
 			if ("FAMI".equals(section)) {
 				this.family = readString(stream, sectionLength);
 			} else if ("WEIG".equals(section)) {
-				this.isBold = readString(stream, sectionLength).equals("bold");
+				this.isBold = "bold".equals(readString(stream, sectionLength));
 			} else if ("SLAN".equals(section)) {
-				this.isItalic = readString(stream, sectionLength).equals("italic");
+				this.isItalic = "italic".equals(readString(stream, sectionLength));
 			} else if ("PTSZ".equals(section)) {
 				this.pointSize = readUnsignedShort(stream);
 			} else if ("MAXW".equals(section)) {

common/buildcraft/core/tablet/utils/TabletTextUtils.java

@@ -3,7 +3,7 @@ package buildcraft.core.tablet.utils;
 import java.util.ArrayList;
 import java.util.List;
 
-public class TabletTextUtils {
+public final class TabletTextUtils {
 	private TabletTextUtils() {
 
 	}

common/buildcraft/energy/TileEngineIron.java

@@ -27,8 +27,8 @@ import buildcraft.api.fuels.BuildcraftFuelRegistry;
 import buildcraft.api.fuels.ICoolant;
 import buildcraft.api.fuels.IFuel;
 import buildcraft.api.fuels.ISolidCoolant;
-import buildcraft.core.GuiIds;
 import buildcraft.api.transport.IItemPipe;
+import buildcraft.core.GuiIds;
 import buildcraft.core.lib.engines.TileEngineWithInventory;
 import buildcraft.core.lib.fluids.Tank;
 import buildcraft.core.lib.fluids.TankManager;

common/buildcraft/factory/BlockAutoWorkbench.java

@@ -13,8 +13,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import buildcraft.BuildCraftFactory;
-import buildcraft.core.GuiIds;
 import buildcraft.api.transport.IItemPipe;
+import buildcraft.core.GuiIds;
 import buildcraft.core.lib.block.BlockBuildCraft;
 
 public class BlockAutoWorkbench extends BlockBuildCraft {

common/buildcraft/factory/BlockHopper.java

@@ -18,8 +18,8 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import buildcraft.BuildCraftCore;
 import buildcraft.BuildCraftFactory;
-import buildcraft.core.GuiIds;
 import buildcraft.api.transport.IItemPipe;
+import buildcraft.core.GuiIds;
 import buildcraft.core.lib.block.BlockBuildCraft;
 
 public class BlockHopper extends BlockBuildCraft {

common/buildcraft/factory/FactoryProxyClient.java

@@ -12,11 +12,9 @@ import java.lang.reflect.Method;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.client.registry.RenderingRegistry;
 import buildcraft.BuildCraftFactory;
 import buildcraft.api.core.BCLog;
 import buildcraft.core.lib.EntityBlock;
-import buildcraft.core.lib.render.RenderVoid;
 import buildcraft.core.render.RenderingEntityBlocks;
 import buildcraft.core.render.RenderingEntityBlocks.EntityRenderIndex;
 import buildcraft.factory.gui.GuiAutoCrafting;

common/buildcraft/factory/TileTank.java

@@ -43,11 +43,11 @@ public class TileTank extends TileBuildCraft implements IFluidHandler {
 
 	protected void updateComparators() {
 		int co = calculateComparatorInputOverride();
-		TileTank tank = getBottomTank();
-		while (tank != null) {
-			tank.cachedComparatorOverride = co;
-			tank.hasUpdate = true;
-			tank = getTankAbove(tank);
+		TileTank uTank = getBottomTank();
+		while (uTank != null) {
+			uTank.cachedComparatorOverride = co;
+			uTank.hasUpdate = true;
+			uTank = getTankAbove(uTank);
 		}
 	}
 
@@ -296,7 +296,7 @@ public class TileTank extends TileBuildCraft implements IFluidHandler {
 	public int calculateComparatorInputOverride() {
 		FluidTankInfo[] info = getTankInfo(ForgeDirection.UNKNOWN);
 		if (info.length > 0 && info[0] != null && info[0].fluid != null) {
-			return (info[0].fluid.amount * 15 / info[0].capacity);
+			return info[0].fluid.amount * 15 / info[0].capacity;
 		} else {
 			return 0;
 		}

common/buildcraft/robotics/map/MapRegion.java

@@ -1,7 +1,6 @@
 package buildcraft.robotics.map;
 
 import gnu.trove.map.hash.TIntObjectHashMap;
-
 import net.minecraft.nbt.NBTTagCompound;
 import buildcraft.api.core.INBTStoreable;
 

common/buildcraft/robotics/map/MapWorld.java

@@ -1,7 +1,5 @@
 package buildcraft.robotics.map;
 
-import gnu.trove.map.hash.TLongObjectHashMap;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -14,6 +12,7 @@ import java.util.Iterator;
 import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.Set;
+import gnu.trove.map.hash.TLongObjectHashMap;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import buildcraft.core.lib.utils.NBTUtils;

common/buildcraft/transport/BlockFilteredBuffer.java

@@ -13,8 +13,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import buildcraft.BuildCraftTransport;
-import buildcraft.core.GuiIds;
 import buildcraft.api.transport.IItemPipe;
+import buildcraft.core.GuiIds;
 import buildcraft.core.lib.block.BlockBuildCraft;
 
 public class BlockFilteredBuffer extends BlockBuildCraft {

common/buildcraft/transport/ItemPipe.java

@@ -24,8 +24,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.BCLog;
 import buildcraft.api.core.IIconProvider;
-import buildcraft.core.BCCreativeTab;
 import buildcraft.api.transport.IItemPipe;
+import buildcraft.core.BCCreativeTab;
 import buildcraft.core.lib.items.ItemBuildCraft;
 import buildcraft.core.lib.utils.ColorUtils;
 import buildcraft.core.lib.utils.StringUtils;

common/buildcraft/transport/PipeEventBus.java

@@ -8,7 +8,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-
 import buildcraft.transport.pipes.events.PipeEvent;
 import buildcraft.transport.pipes.events.PipeEventPriority;
 

common/buildcraft/transport/PipeTransportFluids.java

@@ -8,7 +8,6 @@
  */
 package buildcraft.transport;
 
-import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.HashMap;
 import java.util.Map;

common/buildcraft/transport/network/PacketHandlerTransport.java

@@ -10,7 +10,6 @@ package buildcraft.transport.network;
 
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.INetHandler;
 import net.minecraft.tileentity.TileEntity;

common/buildcraft/transport/pipes/PipeFluidsDiamond.java

@@ -8,9 +8,7 @@
  */
 package buildcraft.transport.pipes;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;

common/buildcraft/transport/pipes/events/PipeEventFluid.java

@@ -1,6 +1,5 @@
 package buildcraft.transport.pipes.events;
 
-import java.util.List;
 import com.google.common.collect.Multiset;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;

common/buildcraft/transport/render/PipeRendererTESR.java

@@ -27,7 +27,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
-
 import buildcraft.BuildCraftCore;
 import buildcraft.BuildCraftCore.RenderMode;
 import buildcraft.BuildCraftTransport;

guidelines/buildcraft.checkstyle

@@ -24,7 +24,7 @@
       <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
     </module>
     <module name="ImportOrder">
-      <property name="groups" value="java,com,org,io,joptsimple,net.minecraft,cpw,net.minecraftforge,cofh,buildcraft"/>
+      <property name="groups" value="java,com,org,io,joptsimple,gnu,net.minecraft,cpw,net.minecraftforge,cofh,buildcraft"/>
     </module>
     <module name="WhitespaceAround">
       <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>

misc/dist.sh

@@ -0,0 +1,30 @@
+# This script requires a copy of pngout and kzip.
+# THIS SCRIPT IS HIGHLY TEMPORARY - SHOULD BE REPLACED WITH A GRADLE VERSION
+
+#!/bin/sh
+rm -rf dist
+mkdir -p dist/tmp
+mkdir -p dist/misc
+mkdir -p dist/modules
+cd dist
+cp ../build/libs/buildcraft-$1* .
+cd tmp
+unzip ../../build/libs/buildcraft-$1.jar
+rm ../buildcraft-$1.jar
+
+for i in `find -name *.png`; do ../../tools/pngout "$i"; done
+../../tools/kzip -r -y ../buildcraft-$1.jar *
+
+../../tools/kzip -r -y ../modules/buildcraft-$1-core.jar assets/buildcraft assets/buildcraftcore buildcraft/BuildCraftCore* buildcraft/core \
+	buildcraft/BuildCraftMod* buildcraft/api \
+	cofh LICENSE* changelog mcmod.info versions.txt
+../../tools/kzip -r -y ../modules/buildcraft-$1-builders.jar assets/buildcraftbuilders buildcraft/BuildCraftBuilders* buildcraft/builders LICENSE
+../../tools/kzip -r -y ../modules/buildcraft-$1-energy.jar assets/buildcraftenergy buildcraft/BuildCraftEnergy* buildcraft/energy LICENSE
+../../tools/kzip -r -y ../modules/buildcraft-$1-factory.jar assets/buildcraftfactory buildcraft/BuildCraftFactory* buildcraft/factory LICENSE
+../../tools/kzip -r -y ../modules/buildcraft-$1-robotics.jar assets/buildcraftrobotics buildcraft/BuildCraftRobotics* buildcraft/robotics LICENSE
+../../tools/kzip -r -y ../modules/buildcraft-$1-silicon.jar assets/buildcraftsilicon buildcraft/BuildCraftSilicon* buildcraft/silicon LICENSE
+../../tools/kzip -r -y ../modules/buildcraft-$1-transport.jar assets/buildcrafttransport buildcraft/BuildCraftTransport* buildcraft/transport LICENSE
+
+cd ..
+rm -rf tmp
+cd ..

misc/genfont.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ..
+tools/mkfont -r 0-383,1024-1119 \
+ -o buildcraft_resources/assets/buildcraftcore/tablet/11.pf2 \
+-s 11 /usr/share/fonts/TTF/DejaVuSans.ttf
+tools/mkfont -r 0-383,1024-1119 \
+ -o buildcraft_resources/assets/buildcraftcore/tablet/16.pf2 \
+-s 16 /usr/share/fonts/TTF/DejaVuSans.ttf