Created BC tab for creative inventory. (Yes, finally.)

buildcraft_resources/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Jan 08 22:46:02 CET 2013
-build.number=14
+#Wed Jan 16 18:21:09 CET 2013
+build.number=15

buildcraft_resources/build.xml

@@ -17,7 +17,7 @@
           
 	<property name="mc.version"			 value="1.4.7"/>
     <property name="forge.version"		 value="6.6.0.491"/>
-    <property name="bc.version"          value="3.4.0"/>
+    <property name="bc.version"          value="3.4.1"/>
     <property name="bc.version.full"     value="${bc.version}"/>
     
     <echo message="Starting build for ${bc.version.full}"/>

buildcraft_resources/changelog/3.4.1

@@ -0,0 +1,9 @@
+
+# 3.4.1
+
+- Added: Emerald transport and liquid pipes. (CovertJaguar)
+- Added: Spring water source blocks at bedrock level.
+- Changed: Wood pipe and redstone engine recipes now use wood from the ore dictionary.
+- Changed: Coordinates of invalid pipes are now logged. (agaricusb)
+- Bugfix: Fixed item drops on world load. (davboecki)
+- Bugfix: Proper side checking for liquid pipe connections. (King_Lemming)

common/buildcraft/BuildCraftEnergy.java

@@ -138,7 +138,7 @@ public class BuildCraftEnergy {
 		LanguageRegistry.addName(bucketOil, "Oil Bucket");
 
 		bucketFuel = new ItemBuildCraft(Integer.parseInt(bucketFuelId.value)).setItemName("bucketFuel").setContainerItem(Item.bucketEmpty);
-		bucketFuel.setIconIndex(0 * 16 + 3).setMaxStackSize(1).setCreativeTab(CreativeTabs.tabMisc);
+		bucketFuel.setIconIndex(0 * 16 + 3).setMaxStackSize(1);
 		LanguageRegistry.addName(bucketFuel, "Fuel Bucket");
 
 		oilLiquid = LiquidDictionary.getOrCreateLiquid("Oil", new LiquidStack(oilStill, 1));

common/buildcraft/BuildCraftTransport.java

@@ -303,28 +303,28 @@ public class BuildCraftTransport {
 					pipeItemsSandstone, null);
 
 			Property redPipeWireId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "redPipeWire.id", DefaultProps.RED_PIPE_WIRE);
-			redPipeWire = new ItemBuildCraft(Integer.parseInt(redPipeWireId.value)).setIconIndex(4 * 16 + 0).setCreativeTab(CreativeTabs.tabRedstone);
+			redPipeWire = new ItemBuildCraft(Integer.parseInt(redPipeWireId.value)).setIconIndex(4 * 16 + 0);
 			redPipeWire.setItemName("redPipeWire");
 			LanguageRegistry.addName(redPipeWire, "Red Pipe Wire");
 			AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 1), new ItemStack(Item.redstone, 1),
 					new ItemStack(Item.ingotIron, 1) }, 500, new ItemStack(redPipeWire, 8)));
 
 			Property bluePipeWireId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "bluePipeWire.id", DefaultProps.BLUE_PIPE_WIRE);
-			bluePipeWire = new ItemBuildCraft(Integer.parseInt(bluePipeWireId.value)).setIconIndex(4 * 16 + 1).setCreativeTab(CreativeTabs.tabRedstone);
+			bluePipeWire = new ItemBuildCraft(Integer.parseInt(bluePipeWireId.value)).setIconIndex(4 * 16 + 1);
 			bluePipeWire.setItemName("bluePipeWire");
 			LanguageRegistry.addName(bluePipeWire, "Blue Pipe Wire");
 			AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Item.redstone, 1),
 					new ItemStack(Item.ingotIron, 1) }, 500, new ItemStack(bluePipeWire, 8)));
 
 			Property greenPipeWireId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "greenPipeWire.id", DefaultProps.GREEN_PIPE_WIRE);
-			greenPipeWire = new ItemBuildCraft(Integer.parseInt(greenPipeWireId.value)).setIconIndex(4 * 16 + 2).setCreativeTab(CreativeTabs.tabRedstone);
+			greenPipeWire = new ItemBuildCraft(Integer.parseInt(greenPipeWireId.value)).setIconIndex(4 * 16 + 2);
 			greenPipeWire.setItemName("greenPipeWire");
 			LanguageRegistry.addName(greenPipeWire, "Green Pipe Wire");
 			AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 2), new ItemStack(Item.redstone, 1),
 					new ItemStack(Item.ingotIron, 1) }, 500, new ItemStack(greenPipeWire, 8)));
 
 			Property yellowPipeWireId = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_ITEM, "yellowPipeWire.id", DefaultProps.YELLOW_PIPE_WIRE);
-			yellowPipeWire = new ItemBuildCraft(Integer.parseInt(yellowPipeWireId.value)).setIconIndex(4 * 16 + 3).setCreativeTab(CreativeTabs.tabRedstone);
+			yellowPipeWire = new ItemBuildCraft(Integer.parseInt(yellowPipeWireId.value)).setIconIndex(4 * 16 + 3);
 			yellowPipeWire.setItemName("yellowPipeWire");
 			LanguageRegistry.addName(yellowPipeWire, "Yellow Pipe Wire");
 			AssemblyRecipe.assemblyRecipes.add(new AssemblyRecipe(new ItemStack[] { new ItemStack(Item.dyePowder, 1, 11), new ItemStack(Item.redstone, 1),

common/buildcraft/builders/BlockArchitect.java

@@ -13,7 +13,6 @@ import java.util.ArrayList;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -25,6 +24,7 @@ import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftBuilders;
 import buildcraft.api.core.Position;
 import buildcraft.api.tools.IToolWrench;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.GuiIds;
 import buildcraft.core.proxy.CoreProxy;
@@ -41,7 +41,7 @@ public class BlockArchitect extends BlockContainer {
 	public BlockArchitect(int i) {
 		super(i, Material.iron);
 		setHardness(0.5F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 		blockTextureSides = 3 * 16 + 0;
 		blockTextureTopNeg = 3 * 16 + 1;
 		blockTextureTopPos = 3 * 16 + 2;

common/buildcraft/builders/BlockBlueprintLibrary.java

@@ -13,13 +13,13 @@ import java.util.ArrayList;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import buildcraft.BuildCraftBuilders;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.GuiIds;
 import buildcraft.core.proxy.CoreProxy;
@@ -28,7 +28,7 @@ public class BlockBlueprintLibrary extends BlockContainer {
 
 	public BlockBlueprintLibrary(int i) {
 		super(i, Material.wood);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 		setHardness(0.7F);
 	}
 

common/buildcraft/builders/BlockBuilder.java

@@ -13,7 +13,6 @@ import java.util.ArrayList;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -24,6 +23,7 @@ import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftBuilders;
 import buildcraft.api.core.Position;
 import buildcraft.api.tools.IToolWrench;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.GuiIds;
 import buildcraft.core.proxy.CoreProxy;
@@ -41,7 +41,7 @@ public class BlockBuilder extends BlockContainer {
 		blockTextureTop = 3 * 16 + 6;
 		blockTextureFront = 3 * 16 + 7;
 		setHardness(0.7F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/builders/BlockFiller.java

@@ -13,7 +13,6 @@ import java.util.ArrayList;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -21,6 +20,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import buildcraft.BuildCraftBuilders;
 import buildcraft.api.filler.IFillerPattern;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.GuiIds;
 import buildcraft.core.proxy.CoreProxy;
@@ -37,7 +37,7 @@ public class BlockFiller extends BlockContainer {
 		super(i, Material.iron);
 
 		setHardness(0.5F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 
 		textureSides = 4 * 16 + 2;
 		textureTopOn = 4 * 16 + 0;

common/buildcraft/builders/BlockMarker.java

@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -24,6 +23,7 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import buildcraft.BuildCraftBuilders;
 import buildcraft.BuildCraftCore;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.Utils;
 
@@ -35,7 +35,7 @@ public class BlockMarker extends BlockContainer {
 		blockIndexInTexture = 3 * 16 + 9;
 
 		setLightValue(0.5F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@SuppressWarnings({ "all" })

common/buildcraft/builders/ItemBptBase.java

@@ -11,12 +11,12 @@ package buildcraft.builders;
 
 import java.util.List;
 
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import buildcraft.BuildCraftBuilders;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.ItemBuildCraft;
 import buildcraft.core.blueprints.BptBase;
 import buildcraft.core.proxy.CoreProxy;
@@ -28,7 +28,7 @@ public abstract class ItemBptBase extends ItemBuildCraft {
 
 		maxStackSize = 1;
 		iconIndex = 5 * 16 + 0;
-		this.setCreativeTab(CreativeTabs.tabMisc);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@SuppressWarnings({ "all" })

common/buildcraft/builders/TileBuilder.java

@@ -44,7 +44,6 @@ import buildcraft.core.blueprints.BptContext;
 import buildcraft.core.network.PacketUpdate;
 import buildcraft.core.network.TileNetworkData;
 import buildcraft.core.proxy.CoreProxy;
-import buildcraft.core.utils.SurroundingInventory;
 import buildcraft.core.utils.Utils;
 
 public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IPowerReceptor, IMachine {

common/buildcraft/core/BlockBuildCraft.java

@@ -15,6 +15,7 @@ public abstract class BlockBuildCraft extends BlockContainer {
 	protected BlockBuildCraft(int id, Material material) {
 		super(id, material);
 		this.rand = new Random();
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/core/BlockSpring.java

@@ -4,7 +4,6 @@ import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.world.World;
 
 public class BlockSpring extends Block {
@@ -15,8 +14,8 @@ public class BlockSpring extends Block {
 		setResistance(6000000.0F);
 		setStepSound(soundStoneFootstep);
 		disableStats();
-		setCreativeTab(CreativeTabs.tabBlock);
 		setTickRandomly(true);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/core/CreativeTabBuildCraft.java

@@ -0,0 +1,24 @@
+package buildcraft.core;
+
+import buildcraft.BuildCraftCore;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemStack;
+
+public class CreativeTabBuildCraft extends CreativeTabs {
+
+	public static final CreativeTabs tabBuildCraft = new CreativeTabBuildCraft("buildcraft");
+	
+	public CreativeTabBuildCraft(String label) {
+		super(label);
+	}
+
+	@Override
+    public ItemStack getIconItemStack() {
+		return new ItemStack(BuildCraftCore.diamondGearItem);
+	}
+	
+	@Override
+    public String getTranslatedTabLabel() {
+		return "BuildCraft";
+	}
+}

common/buildcraft/core/ItemBuildCraft.java

@@ -18,6 +18,7 @@ public class ItemBuildCraft extends Item {
 	public ItemBuildCraft(int i) {
 		super(i);
 		setTextureFile(DefaultProps.TEXTURE_ITEMS);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/core/ItemRedstoneChipset.java

@@ -15,7 +15,6 @@ public class ItemRedstoneChipset extends ItemBuildCraft {
 
 		setHasSubtypes(true);
 		setMaxDamage(0);
-		setCreativeTab(CreativeTabs.tabRedstone);
 	}
 
 	@SuppressWarnings({ "all" })

common/buildcraft/core/ItemWrench.java

@@ -1,6 +1,5 @@
 package buildcraft.core;
 
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 import buildcraft.api.tools.IToolWrench;
@@ -9,7 +8,6 @@ public class ItemWrench extends ItemBuildCraft implements IToolWrench {
 
 	public ItemWrench(int i) {
 		super(i);
-		setCreativeTab(CreativeTabs.tabTools);
 	}
 
 	@Override

common/buildcraft/energy/BlockEngine.java

@@ -24,6 +24,7 @@ import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftCore;
 import buildcraft.BuildCraftEnergy;
 import buildcraft.api.tools.IToolWrench;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.GuiIds;
 import buildcraft.core.IItemPipe;
 import buildcraft.core.proxy.CoreProxy;
@@ -34,7 +35,7 @@ public class BlockEngine extends BlockContainer {
 		super(i, Material.iron);
 
 		setHardness(0.5F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 		setBlockName("engineBlock");
 	}
 

common/buildcraft/energy/ItemBucketOil.java

@@ -12,6 +12,7 @@ package buildcraft.energy;
 import net.minecraft.item.ItemBucket;
 import net.minecraft.item.ItemStack;
 import buildcraft.BuildCraftEnergy;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.StringUtil;
 
@@ -20,6 +21,7 @@ public class ItemBucketOil extends ItemBucket {
 	public ItemBucketOil(int i) {
 		super(i, BuildCraftEnergy.oilMoving.blockID);
 		iconIndex = 0 * 16 + 1;
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/factory/BlockAutoWorkbench.java

@@ -12,7 +12,6 @@ package buildcraft.factory;
 import java.util.ArrayList;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -33,7 +32,6 @@ public class BlockAutoWorkbench extends BlockBuildCraft {
 		topTexture = 2 * 16 + 11;
 		sideTexture = 2 * 16 + 12;
 		setHardness(1.0F);
-		setCreativeTab(CreativeTabs.tabDecorations);
 	}
 
 	@Override

common/buildcraft/factory/BlockHopper.java

@@ -3,7 +3,6 @@ package buildcraft.factory;
 import java.util.ArrayList;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -20,7 +19,6 @@ public class BlockHopper extends BlockBuildCraft {
 	public BlockHopper(int blockId) {
 		super(blockId, Material.iron);
 		setHardness(5F);
-		setCreativeTab(CreativeTabs.tabDecorations);
 	}
 
 	@Override

common/buildcraft/factory/BlockMachineRoot.java

@@ -11,16 +11,16 @@ package buildcraft.factory;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.IMachine;
 
 public abstract class BlockMachineRoot extends BlockContainer {
 
 	protected BlockMachineRoot(int i, Material material) {
 		super(i, material);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/factory/BlockMiningWell.java

@@ -37,7 +37,6 @@ public class BlockMiningWell extends BlockMachineRoot {
 		textureSides = 16 * 2 + 5;
 		textureBack = 16 * 2 + 6;
 		textureTop = 16 * 2 + 4;
-
 	}
 
 	@Override

common/buildcraft/factory/BlockPump.java

@@ -13,10 +13,10 @@ import java.util.ArrayList;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.Utils;
 
@@ -25,7 +25,7 @@ public class BlockPump extends BlockContainer {
 	public BlockPump(int i) {
 		super(i, Material.iron);
 		setHardness(5F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/factory/BlockRefinery.java

@@ -13,7 +13,6 @@ import java.util.ArrayList;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -27,6 +26,7 @@ import buildcraft.BuildCraftCore;
 import buildcraft.BuildCraftFactory;
 import buildcraft.api.core.Position;
 import buildcraft.api.tools.IToolWrench;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.GuiIds;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.Utils;
@@ -37,7 +37,7 @@ public class BlockRefinery extends BlockContainer {
 		super(i, Material.iron);
 
 		setHardness(0.5F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/factory/BlockTank.java

@@ -13,7 +13,6 @@ import java.util.ArrayList;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -23,6 +22,7 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.liquids.LiquidContainerRegistry;
 import net.minecraftforge.liquids.LiquidStack;
 import buildcraft.BuildCraftCore;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.Utils;
 
@@ -32,7 +32,7 @@ public class BlockTank extends BlockContainer {
 		super(i, Material.glass);
 		setBlockBounds(0.125F, 0F, 0.125F, 0.875F, 1F, 0.875F);
 		setHardness(0.5F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/silicon/BlockAssemblyTable.java

@@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import buildcraft.BuildCraftSilicon;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.Utils;
@@ -24,7 +25,7 @@ public class BlockAssemblyTable extends BlockContainer {
 
 		setBlockBounds(0, 0, 0, 1, 9F / 16F, 1);
 		setHardness(0.5F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 
 	}
 

common/buildcraft/silicon/BlockLaser.java

@@ -13,11 +13,11 @@ import java.util.ArrayList;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.DefaultProps;
 
 public class BlockLaser extends BlockContainer {
@@ -25,7 +25,7 @@ public class BlockLaser extends BlockContainer {
 	public BlockLaser(int i) {
 		super(i, Material.iron);
 		setHardness(0.5F);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/transport/ItemFacade.java

@@ -16,6 +16,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.recipes.AssemblyRecipe;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.ItemBuildCraft;
 import buildcraft.core.proxy.CoreProxy;
 
@@ -34,7 +35,7 @@ public class ItemFacade extends ItemBuildCraft {
 
 		setHasSubtypes(true);
 		setMaxDamage(0);
-		this.setCreativeTab(CreativeTabs.tabMisc);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/transport/ItemGate.java

@@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.ItemBuildCraft;
 
 public class ItemGate extends ItemBuildCraft {
@@ -20,7 +21,7 @@ public class ItemGate extends ItemBuildCraft {
 
 		setHasSubtypes(true);
 		setMaxDamage(0);
-		setCreativeTab(CreativeTabs.tabRedstone);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@SuppressWarnings({ "all" })

common/buildcraft/transport/ItemPipe.java

@@ -10,11 +10,11 @@
 package buildcraft.transport;
 
 import net.minecraft.block.Block;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import buildcraft.BuildCraftTransport;
+import buildcraft.core.CreativeTabBuildCraft;
 import buildcraft.core.IItemPipe;
 import buildcraft.core.ItemBuildCraft;
 import buildcraft.BuildCraftCore;
@@ -27,7 +27,7 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe {
 
 	protected ItemPipe(int i) {
 		super(i);
-		this.setCreativeTab(CreativeTabs.tabTransport);
+		setCreativeTab(CreativeTabBuildCraft.tabBuildCraft);
 	}
 
 	@Override

common/buildcraft/transport/render/RenderPipe.java

@@ -9,15 +9,10 @@
 
 package buildcraft.transport.render;
 
-import static org.lwjgl.opengl.GL11.glScalef;
-
 import java.util.HashMap;
-import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.GLAllocation;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -27,9 +22,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.IItemRenderer;
-import net.minecraftforge.client.IItemRenderer.ItemRenderType;
-import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.liquids.LiquidStack;
 
@@ -434,8 +426,6 @@ public class RenderPipe extends TileEntitySpecialRenderer {
 		GL11.glPopMatrix();
 	}
 
-	private Random random = new Random();
-
 	public void doRenderItem(IPipedItem entityitem, double d, double d1, double d2, float f1) {
 
 		if (entityitem == null || entityitem.getItemStack() == null)

common/buildcraft/transport/render/TileEntityPickupFX.java

@@ -17,12 +17,10 @@ import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.particle.EntityFX;
-import net.minecraft.client.particle.EntityPickupFX;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.tileentity.TileEntity;
 import buildcraft.core.utils.Utils;
@@ -61,9 +59,6 @@ public class TileEntityPickupFX extends EntityFX
         double var21 = var9 + (var15 - var9) * (double)var8;
         double var23 = var11 + (var17 - var11) * (double)var8;
         double var25 = var13 + (var19 - var13) * (double)var8;
-        int var27 = MathHelper.floor_double(var21);
-        int var28 = MathHelper.floor_double(var23 + (double)(this.yOffset / 2.0F));
-        int var29 = MathHelper.floor_double(var25);
         int var30 = this.getBrightnessForRender(par2);
         int var31 = var30 % 65536;
         int var32 = var30 / 65536;