Merge pull request #2946 from ganymedes01/6.5.x

Did a bit of a clean up

common/buildcraft/builders/EntityMechanicalArm.java

@@ -25,8 +25,6 @@ public class EntityMechanicalArm extends Entity {
 	private double yRoot;
 	private double zRoot;
 
-	private boolean inProgressionXZ = false;
-	private boolean inProgressionY = false;
 	private int headX, headY, headZ;
 	private EntityBlock xArm, yArm, zArm, head;
 

common/buildcraft/builders/TileBuilder.java

@@ -34,7 +34,6 @@ import net.minecraftforge.fluids.IFluidHandler;
 
 import buildcraft.BuildCraftBuilders;
 import buildcraft.BuildCraftCore;
-import buildcraft.api.blueprints.BuildingPermission;
 import buildcraft.api.core.BCLog;
 import buildcraft.api.core.BlockIndex;
 import buildcraft.api.core.IInvSlot;

common/buildcraft/builders/TileFiller.java

@@ -28,7 +28,6 @@ import buildcraft.api.tiles.IHasWork;
 import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;
 import buildcraft.core.blueprints.BptBuilderTemplate;
-import buildcraft.core.blueprints.BptContext;
 import buildcraft.core.builders.TileAbstractBuilder;
 import buildcraft.core.builders.patterns.FillerPattern;
 import buildcraft.core.builders.patterns.PatternFill;
@@ -47,7 +46,6 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro
 	public IStatementParameter[] patternParameters;
 
 	private BptBuilderTemplate currentTemplate;
-	private BptContext context;
 
 	private final Box box = new Box();
 	private boolean done = false;
@@ -97,7 +95,6 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro
 	private void initTemplate() {
 		if (currentPattern != null && box.isInitialized()) {
 			currentTemplate = currentPattern.getTemplateBuilder(box, getWorldObj(), patternParameters);
-			context = currentTemplate.getContext();
 			currentTemplate.blueprint.excavate = excavate;
 		}
 	}

common/buildcraft/builders/blueprints/RecursiveBlueprintReader.java

@@ -43,7 +43,6 @@ public class RecursiveBlueprintReader {
 	private float computingTime = 0;
 
 	private boolean done = false;
-	private boolean saveInItem = false;
 
 	private BlueprintBase parentBlueprint;
 

common/buildcraft/builders/gui/GuiBuilder.java

@@ -32,7 +32,6 @@ import buildcraft.core.lib.utils.StringUtils;
 public class GuiBuilder extends GuiAdvancedInterface {
 	private static final ResourceLocation REGULAR_TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/builder.png");
 	private static final ResourceLocation BLUEPRINT_TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/builder_blueprint.png");
-	private IInventory playerInventory;
 	private TileBuilder builder;
 	private GuiButton selectedButton;
 	private int sbPosition, sbLength;
@@ -40,7 +39,6 @@ public class GuiBuilder extends GuiAdvancedInterface {
 
 	public GuiBuilder(IInventory playerInventory, TileBuilder builder) {
 		super(new ContainerBuilder(playerInventory, builder), builder, BLUEPRINT_TEXTURE);
-		this.playerInventory = playerInventory;
 		this.builder = builder;
 		xSize = 256;
 		ySize = 225;

common/buildcraft/builders/gui/GuiFiller.java

@@ -61,14 +61,12 @@ public class GuiFiller extends GuiAdvancedInterface {
 	private static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftbuilders:textures/gui/filler.png");
 	private static final IButtonTextureSet EXCAVATE_OFF = new ButtonTextureSet(240, -16, 16, 16, TEXTURE);
 	private static final IButtonTextureSet EXCAVATE_ON = new ButtonTextureSet(224, -16, 16, 16, TEXTURE);
-	private final IInventory playerInventory;
 	private final TileFiller filler;
 	private final GuiFiller instance;
 	private final StatementSlot fakeStatementSlot;
 
 	public GuiFiller(IInventory playerInventory, TileFiller filler) {
 		super(new ContainerFiller(playerInventory, filler), filler, TEXTURE);
-		this.playerInventory = playerInventory;
 		this.filler = filler;
 		this.instance = this;
 		this.fakeStatementSlot = new StatementSlot(instance, -1, -1, 0) {

common/buildcraft/builders/urbanism/GuiUrbanist.java

@@ -29,7 +29,6 @@ public class GuiUrbanist extends GuiAdvancedInterface {
 	public TileUrbanist urbanist;
 	public UrbanistTool[] tools = new UrbanistTool[10];
 
-	private IInventory playerInventory;
 	private int selectedTool = -1;
 
 	class ToolSlot extends AdvancedSlot {
@@ -60,7 +59,6 @@ public class GuiUrbanist extends GuiAdvancedInterface {
 		xSize = width;
 		ySize = height;
 
-		this.playerInventory = playerInventory;
 		this.urbanist = urbanist;
 
 		urbanist.createUrbanistEntity();

common/buildcraft/core/BCCreativeTab.java

@@ -19,12 +19,10 @@ import net.minecraft.item.ItemStack;
 public class BCCreativeTab extends CreativeTabs {
 	private static final Map<String, BCCreativeTab> tabs = new HashMap<String, BCCreativeTab>();
 
-	private final String name;
 	private ItemStack icon;
 
 	public BCCreativeTab(String name) {
 		super("buildcraft." + name);
-		this.name = name;
 
 		tabs.put(name, this);
 	}

common/buildcraft/core/Version.java

@@ -249,7 +249,6 @@ public class Version implements Runnable {
 	public static void displayChangelog(ICommandSender sender) {
 		sender.addChatMessage(new ChatComponentText(EnumChatFormatting.GRAY + "" + EnumChatFormatting.BOLD
 				+ StatCollector.translateToLocalFormatted("command.buildcraft.changelog_header", getRecommendedVersion())));
-		int nb = 0;
 		for (String updateLine : Version.getChangelog()) {
 			String colour = "\u00A79";
 			if (updateLine.startsWith("*")) {

common/buildcraft/core/blueprints/BlueprintBase.java

@@ -133,8 +133,6 @@ public abstract class BlueprintBase {
 			sub.setInteger("x", (int) np.x);
 			sub.setInteger("z", (int) np.z);
 			sub.setByte("dir", (byte) dir.ordinal());
-
-			NBTTagCompound bpt = sub.getCompoundTag("bpt");
 		}
 
 		context.rotateLeft();

common/buildcraft/core/builders/patterns/FillerPattern.java

@@ -120,8 +120,6 @@ public abstract class FillerPattern implements IFillerPattern {
 	 * Generates an empty in a given area
 	 */
 	public static void empty(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, Template template) {
-		int lastX = Integer.MAX_VALUE, lastY = Integer.MAX_VALUE, lastZ = Integer.MAX_VALUE;
-
 		for (int y = yMax; y >= yMin; y--) {
 			for (int x = xMin; x <= xMax; ++x) {
 				for (int z = zMin; z <= zMax; ++z) {
@@ -137,8 +135,6 @@ public abstract class FillerPattern implements IFillerPattern {
 	 * Generates a flatten in a given area
 	 */
 	public static void flatten(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, Template template) {
-		int lastX = Integer.MAX_VALUE, lastY = Integer.MAX_VALUE, lastZ = Integer.MAX_VALUE;
-
 		for (int x = xMin; x <= xMax; ++x) {
 			for (int z = zMin; z <= zMax; ++z) {
 				for (int y = yMax; y >= yMin; --y) {

common/buildcraft/core/proxy/CoreProxy.java

@@ -18,7 +18,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.world.World;
@@ -101,13 +100,12 @@ public class CoreProxy implements ICoreProxy {
 		stack.onCrafting(world, player, stack.stackSize);
 	}
 
-	@SuppressWarnings("unchecked")
 	public void addCraftingRecipe(ItemStack result, Object... recipe) {
-		CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(result, recipe));
+		GameRegistry.addRecipe(new ShapedOreRecipe(result, recipe));
 	}
 
 	public void addShapelessRecipe(ItemStack result, Object... recipe) {
-		CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(result, recipe));
+		GameRegistry.addRecipe(new ShapelessOreRecipe(result, recipe));
 	}
 
 	public String playerName() {

common/buildcraft/core/recipes/AssemblyRecipeManager.java

@@ -49,7 +49,7 @@ public class AssemblyRecipeManager implements IAssemblyRecipeManager {
 		return assemblyRecipes.values();
 	}
 
-	public IFlexibleRecipe getRecipe(String id) {
+	public IFlexibleRecipe<ItemStack> getRecipe(String id) {
 		return assemblyRecipes.get(id);
 	}
 

common/buildcraft/core/recipes/RefineryRecipeManager.java

@@ -23,16 +23,14 @@ public final class RefineryRecipeManager implements IRefineryRecipeManager {
 
 	public static final RefineryRecipeManager INSTANCE = new RefineryRecipeManager();
 	private HashMap<String, IFlexibleRecipe<FluidStack>> recipes = new HashMap<String, IFlexibleRecipe<FluidStack>>();
-	private ArrayList<FluidStack> validFluids1 = new ArrayList();
-	private ArrayList<FluidStack> validFluids2 = new ArrayList();
+	private ArrayList<FluidStack> validFluids1 = new ArrayList<FluidStack>();
+	private ArrayList<FluidStack> validFluids2 = new ArrayList<FluidStack>();
 
 	private RefineryRecipeManager() {
 	}
 
 	@Override
 	public void addRecipe(String id, FluidStack ingredient, FluidStack result, int energy, int delay) {
-		String name = result.getFluid().getName();
-
 		FlexibleRecipe<FluidStack> recipe = new FlexibleRecipe<FluidStack>(id, result, energy, delay, ingredient);
 		recipes.put(id, recipe);
 		validFluids1.add(ingredient);

common/buildcraft/core/tablet/GuiTablet.java

@@ -27,7 +27,6 @@ public class GuiTablet extends GuiScreen {
 	private static final int X_SIZE = 142;
 	private static final int Y_SIZE = 180;
 	private final DynamicTextureBC display;
-	private final EntityPlayer player;
 	private final TabletThread tabletThread;
 	private final TabletClient tablet;
 	private int guiLeft, guiTop;
@@ -41,7 +40,6 @@ public class GuiTablet extends GuiScreen {
 		this.tabletThread = TabletManagerClient.INSTANCE.get();
 		this.tablet = (TabletClient) tabletThread.getTablet();
 		this.lastDate = (new Date()).getTime();
-		this.player = player;
 		this.display = new DynamicTextureBC(tablet.getScreenWidth(), tablet.getScreenHeight());
 
 		tablet.updateGui(0.0F, this, true);
@@ -107,7 +105,6 @@ public class GuiTablet extends GuiScreen {
 			} else if (buttonState == 2) {
 				if (isButton(x, y)) {
 					buttonState = ENABLE_HIGHLIGHT ? 0 : 1;
-					System.out.println("PRESS");
 				} else {
 					buttonState = 1;
 				}

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

@@ -70,7 +70,6 @@ public final class TabletFont {
 		}
 	}
 
-	private String family;
 	private boolean isBold;
 	private boolean isItalic;
 	private int pointSize, maxW, maxH, ascent, descent;
@@ -89,7 +88,7 @@ public final class TabletFont {
 			loaded += 8;
 
 			if ("FAMI".equals(section)) {
-				this.family = readString(stream, sectionLength);
+				readString(stream, sectionLength);
 			} else if ("WEIG".equals(section)) {
 				this.isBold = "bold".equals(readString(stream, sectionLength));
 			} else if ("SLAN".equals(section)) {

common/buildcraft/energy/TileEngineIron.java

@@ -300,7 +300,7 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan
 			// Fluid Fuel ID
 			case 15:
 				if (FluidRegistry.getFluid(value) != null) {
-					tankFuel.setFluid(new FluidStack(value, tankFuelAmountCache));
+					tankFuel.setFluid(new FluidStack(FluidRegistry.getFluid(value), tankFuelAmountCache));
 				} else {
 					tankFuel.setFluid(null);
 				}
@@ -308,7 +308,7 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan
 			// Fluid Coolant ID
 			case 16:
 				if (FluidRegistry.getFluid(value) != null) {
-					tankCoolant.setFluid(new FluidStack(value, tankCoolantAmountCache));
+					tankCoolant.setFluid(new FluidStack(FluidRegistry.getFluid(value), tankCoolantAmountCache));
 				} else {
 					tankCoolant.setFluid(null);
 				}

common/buildcraft/factory/BlockPump.java

@@ -13,7 +13,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
@@ -21,7 +20,6 @@ import buildcraft.api.tools.IToolWrench;
 import buildcraft.core.lib.block.BlockBuildCraft;
 
 public class BlockPump extends BlockBuildCraft {
-	private IIcon[] led;
 
 	public BlockPump() {
 		super(Material.iron);

common/buildcraft/factory/TileRefinery.java

@@ -152,31 +152,6 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IInve
 		}
 	}
 
-	private boolean containsInput(FluidStack ingredient) {
-		if (ingredient == null) {
-			return true;
-		}
-
-		return (tanks[0].getFluid() != null && tanks[0].getFluid().containsFluid(ingredient))
-				|| (tanks[1].getFluid() != null && tanks[1].getFluid().containsFluid(ingredient));
-	}
-
-	private boolean consumeInput(FluidStack liquid) {
-		if (liquid == null) {
-			return true;
-		}
-
-		if (tanks[0].getFluid() != null && tanks[0].getFluid().containsFluid(liquid)) {
-			tanks[0].drain(liquid.amount, true);
-			return true;
-		} else if (tanks[1].getFluid() != null && tanks[1].getFluid().containsFluid(liquid)) {
-			tanks[1].drain(liquid.amount, true);
-			return true;
-		}
-
-		return false;
-	}
-
 	@Override
 	public boolean hasWork() {
 		return isActive;
@@ -328,7 +303,7 @@ public class TileRefinery extends TileBuildCraft implements IFluidHandler, IInve
 		currentRecipe = null;
 		craftingResult = null;
 
-		for (IFlexibleRecipe recipe : RefineryRecipeManager.INSTANCE.getRecipes()) {
+		for (IFlexibleRecipe<FluidStack> recipe : RefineryRecipeManager.INSTANCE.getRecipes()) {
 			craftingResult = recipe.craft(this, true);
 
 			if (craftingResult != null) {

common/buildcraft/robotics/EntityRobot.java

@@ -416,14 +416,6 @@ public class EntityRobot extends EntityRobotBase implements
 		}
 	}
 
-	private void iterateBehaviorDocked() {
-		motionX = 0F;
-		motionY = 0F;
-		motionZ = 0F;
-
-		setNullBoundingBox();
-	}
-
 	@Override
 	public void writeSpawnData(ByteBuf data) {
 		data.writeByte(wearables.size());

common/buildcraft/robotics/boards/BCBoardNBT.java

@@ -24,7 +24,7 @@ import buildcraft.core.lib.utils.StringUtils;
 public class BCBoardNBT extends RedstoneBoardRobotNBT {
 	public static final Map<String, BCBoardNBT> REGISTRY = new HashMap<String, BCBoardNBT>();
 	private final ResourceLocation texture;
-	private final String id, name, upperName, boardType;
+	private final String id, upperName, boardType;
 	private final Constructor<? extends RedstoneBoardRobot> boardInit;
 
 	@SideOnly(Side.CLIENT)
@@ -32,7 +32,6 @@ public class BCBoardNBT extends RedstoneBoardRobotNBT {
 
 	public BCBoardNBT(String id, String name, Class<? extends RedstoneBoardRobot> board, String boardType) {
 		this.id = id;
-		this.name = name;
 		this.boardType = boardType;
 		this.upperName = name.substring(0, 1).toUpperCase() + name.substring(1);
 		this.texture = new ResourceLocation(

common/buildcraft/robotics/gui/GuiRequester.java

@@ -22,11 +22,8 @@ public class GuiRequester extends GuiAdvancedInterface {
 
 	private TileRequester requester;
 
-	private IInventory playerInventory;
-
 	private static class RequestSlot extends AdvancedSlot {
 
-		private ItemStack item;
 		private int index;
 
 		public RequestSlot(GuiAdvancedInterface gui, int iIndex, int x, int y) {
@@ -38,12 +35,6 @@ public class GuiRequester extends GuiAdvancedInterface {
 		public void setItem(ItemStack itemStack) {
 			TileRequester requester = ((GuiRequester) gui).requester;
 
-			if (itemStack != null) {
-				item = itemStack.copy();
-			} else {
-				item = null;
-			}
-
 			requester.setRequest(index, itemStack);
 			((GuiRequester) gui).getContainer().getRequestList();
 		}
@@ -66,7 +57,6 @@ public class GuiRequester extends GuiAdvancedInterface {
 		ySize = 181;
 
 		requester = iRequester;
-		playerInventory = iPlayerInventory;
 
 		for (int x = 0; x < 4; ++x) {
 			for (int y = 0; y < 5; ++y) {

common/buildcraft/robotics/map/MapWorld.java

@@ -21,7 +21,6 @@ import net.minecraft.world.chunk.Chunk;
 import buildcraft.core.lib.utils.NBTUtils;
 
 public class MapWorld {
-	private final World world;
 	private final LongHashMap regionMap;
 	private final HashMap<Chunk, Integer> timeToUpdate = new HashMap<Chunk, Integer>();
 	private final TLongLongHashMap regionUpdateTime;
@@ -29,7 +28,6 @@ public class MapWorld {
 	private final File location;
 
 	public MapWorld(World world, File location) {
-		this.world = world;
 		regionMap = new LongHashMap();
 		regionUpdateTime = new TLongLongHashMap();
 		updatedChunks = new TLongHashSet();

common/buildcraft/silicon/BlockLaser.java

@@ -78,7 +78,7 @@ public class BlockLaser extends BlockBuildCraft implements ICustomHighlight {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void addCollisionBoxesToList(World wrd, int x, int y, int z, AxisAlignedBB mask, List list, Entity ent) {
 		AxisAlignedBB[] aabbs = boxes[wrd.getBlockMetadata(x, y, z)];
 		for (AxisAlignedBB aabb : aabbs) {

common/buildcraft/silicon/TileAssemblyTable.java

@@ -47,7 +47,7 @@ public class TileAssemblyTable extends TileLaserTableBase implements IInventory,
 	public List<CraftingResult<ItemStack>> getPotentialOutputs() {
 		List<CraftingResult<ItemStack>> result = new LinkedList<CraftingResult<ItemStack>>();
 
-		for (IFlexibleRecipe recipe : AssemblyRecipeManager.INSTANCE.getRecipes()) {
+		for (IFlexibleRecipe<ItemStack> recipe : AssemblyRecipeManager.INSTANCE.getRecipes()) {
 			CraftingResult<ItemStack> r = recipe.craft(this, true);
 
 			if (r != null) {
@@ -209,7 +209,7 @@ public class TileAssemblyTable extends TileLaserTableBase implements IInventory,
 		}
 	}
 
-	public boolean isPlanned(IFlexibleRecipe recipe) {
+	public boolean isPlanned(IFlexibleRecipe<ItemStack> recipe) {
 		if (recipe == null) {
 			return false;
 		}
@@ -217,7 +217,7 @@ public class TileAssemblyTable extends TileLaserTableBase implements IInventory,
 		return plannedOutput.contains(recipe.getId());
 	}
 
-	public boolean isAssembling(IFlexibleRecipe recipe) {
+	public boolean isAssembling(IFlexibleRecipe<ItemStack> recipe) {
 		return recipe != null && recipe == currentRecipe;
 	}
 

common/buildcraft/silicon/gui/GuiChargingTable.java

@@ -16,11 +16,9 @@ import buildcraft.silicon.TileChargingTable;
 public class GuiChargingTable extends GuiLaserTable {
 
 	public static final ResourceLocation TEXTURE = new ResourceLocation("buildcraftsilicon:textures/gui/charging_table.png");
-	private final TileChargingTable table;
 
 	public GuiChargingTable(InventoryPlayer playerInventory, TileChargingTable chargingTable) {
 		super(playerInventory, new ContainerChargingTable(playerInventory, chargingTable), chargingTable, TEXTURE);
-		this.table = chargingTable;
 		xSize = 176;
 		ySize = 132;
 	}

common/buildcraft/silicon/render/PackageFontRenderer.java

@@ -15,12 +15,10 @@ public class PackageFontRenderer extends FontRenderer {
 	private static final RenderItem itemRender = new RenderItem();
 	private static final Minecraft mc = Minecraft.getMinecraft();
 	private static final FontRenderer realRenderer = mc.fontRenderer;
-	private final ItemStack packageStack;
 	private final NBTTagCompound pkgTag;
 
 	public PackageFontRenderer(ItemStack packageStack) {
 		super(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.getTextureManager(), mc.fontRenderer.getUnicodeFlag());
-		this.packageStack = packageStack;
 		this.pkgTag = NBTUtils.getItemData(packageStack);
 	}
 
@@ -57,8 +55,8 @@ public class PackageFontRenderer extends FontRenderer {
 						font = Minecraft.getMinecraft().fontRenderer;
 					}
 
-					itemRender.renderItemAndEffectIntoGUI(font, this.mc.getTextureManager(), slotStack, rx * 2, y * 2);
-					itemRender.renderItemOverlayIntoGUI(font, this.mc.getTextureManager(), slotStack, rx * 2, y * 2);
+					itemRender.renderItemAndEffectIntoGUI(font, mc.getTextureManager(), slotStack, rx * 2, y * 2);
+					itemRender.renderItemOverlayIntoGUI(font, mc.getTextureManager(), slotStack, rx * 2, y * 2);
 					itemRender.zLevel = 0.0F;
 				} else {
 					realRenderer.drawString("X", rx, y, 0xFF0000);

common/buildcraft/transport/Pipe.java

@@ -576,12 +576,4 @@ public abstract class Pipe<T extends PipeTransport> implements IDropControlInven
 		
 		return gates[side.ordinal()];
 	}
-
-	private void pushActionState(ActionState state) {
-		actionStates.add(state);
-	}
-
-	private Collection<ActionState> getActionStates() {
-		return actionStates;
-	}
 }

common/buildcraft/transport/PipeColoringRecipe.java

@@ -14,7 +14,6 @@ public class PipeColoringRecipe implements IRecipe {
 		ItemStack oneColorPipeStack = null;
 		ItemStack pipeStack = null;
 		
-		boolean hasDifferentColorPipes = false;
 		boolean hasDifferentPipes = false;
 		
 		boolean isBleach = false;
@@ -35,11 +34,8 @@ public class PipeColoringRecipe implements IRecipe {
 						pipeStack.stackSize++;
 						if (oneColorPipeStack.getItemDamage() == oneColorPipeStack.getItemDamage()) {
 							oneColorPipeStack.stackSize++;
-						} else {
-							hasDifferentColorPipes = true;
 						}
 					} else {
-						hasDifferentColorPipes = true;
 						hasDifferentPipes = true;
 					}
 				}

common/buildcraft/transport/PipeEventBus.java

@@ -81,7 +81,7 @@ public class PipeEventBus {
 
 		for (Method m: handler.getClass().getDeclaredMethods()) {
 			if ("eventHandler".equals(m.getName())) {
-				Class[] parameters = m.getParameterTypes();
+				Class<?>[] parameters = m.getParameterTypes();
 				if (parameters.length == 1 && PipeEvent.class.isAssignableFrom(parameters[0])) {
 					Class<? extends PipeEvent> eventType = (Class<? extends PipeEvent>) parameters[0];
 					List<EventHandler> eventHandlerList = getHandlerList(eventType);

common/buildcraft/transport/PipeTransportItems.java

@@ -280,6 +280,8 @@ public class PipeTransportItems extends PipeTransport implements IDebuggable {
 				case SOUTH:
 					item.movePosition(0, 0, item.getSpeed());
 					break;
+				default:
+					break;
 			}
 
 			if ((item.toCenter && middleReached(item)) || outOfBounds(item)) {

common/buildcraft/transport/PipeTriggerProvider.java

@@ -34,10 +34,7 @@ public class PipeTriggerProvider implements ITriggerProvider {
 			return result;
 		}
 		
-		boolean containsGate = false;
-
 		if (container instanceof Gate) {
-			containsGate = true;
 			((Gate) container).addTriggers(result);
 		}
 

common/buildcraft/transport/gui/ContainerDiamondPipe.java

@@ -20,13 +20,11 @@ import buildcraft.transport.Pipe;
 public class ContainerDiamondPipe extends BuildCraftContainer {
 
 	private final IDiamondPipe pipe;
-	private final IInventory playerInv;
 	private final IInventory filterInv;
 
 	public ContainerDiamondPipe(IInventory playerInventory, IDiamondPipe pipe) {
 		super(pipe.getFilters().getSizeInventory());
 		this.pipe = pipe;
-		this.playerInv = playerInventory;
 		this.filterInv = pipe.getFilters();
 
 		for (int y = 0; y < 6; y++) {

common/buildcraft/transport/gui/ContainerEmeraldFluidPipe.java

@@ -19,13 +19,11 @@ import buildcraft.transport.pipes.PipeFluidsEmerald;
 public class ContainerEmeraldFluidPipe extends BuildCraftContainer {
 
 	private final PipeFluidsEmerald pipe;
-	private final IInventory playerInv;
 	private final IInventory filterInv;
 
 	public ContainerEmeraldFluidPipe(IInventory playerInventory, PipeFluidsEmerald pipe) {
 		super(pipe.getFilters().getSizeInventory());
 		this.pipe = pipe;
-		this.playerInv = playerInventory;
 		this.filterInv = pipe.getFilters();
 
 		addSlotToContainer(new SlotPhantom(filterInv, 0, 80, 18));

common/buildcraft/transport/gui/ContainerEmeraldPipe.java

@@ -19,13 +19,11 @@ import buildcraft.transport.pipes.PipeItemsEmerald;
 public class ContainerEmeraldPipe extends BuildCraftContainer {
 
 	private final PipeItemsEmerald pipe;
-	private final IInventory playerInv;
 	private final IInventory filterInv;
 
 	public ContainerEmeraldPipe(IInventory playerInventory, PipeItemsEmerald pipe) {
 		super(pipe.getFilters().getSizeInventory());
 		this.pipe = pipe;
-		this.playerInv = playerInventory;
 		this.filterInv = pipe.getFilters();
 
 		for (int i = 0; i < 9; i++) {

common/buildcraft/transport/pipes/PipeItemsCobblestone.java

@@ -19,7 +19,7 @@ import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeIconProvider;
 import buildcraft.transport.PipeTransportItems;
 
-public class PipeItemsCobblestone extends Pipe {
+public class PipeItemsCobblestone extends Pipe<PipeTransportItems> {
 
 	public PipeItemsCobblestone(Item item) {
 		super(new PipeTransportItems(), item);

common/buildcraft/transport/pipes/PipeItemsGold.java

@@ -23,7 +23,7 @@ import buildcraft.transport.TransportConstants;
 import buildcraft.transport.TravelingItem;
 import buildcraft.transport.pipes.events.PipeEventItem;
 
-public class PipeItemsGold extends Pipe {
+public class PipeItemsGold extends Pipe<PipeTransportItems> {
 
 	public PipeItemsGold(Item item) {
 		super(new PipeTransportItems(), item);

common/buildcraft/transport/pipes/PipeItemsQuartz.java

@@ -22,7 +22,7 @@ import buildcraft.transport.TransportConstants;
 import buildcraft.transport.TravelingItem;
 import buildcraft.transport.pipes.events.PipeEventItem;
 
-public class PipeItemsQuartz extends Pipe {
+public class PipeItemsQuartz extends Pipe<PipeTransportItems> {
 
 	public PipeItemsQuartz(Item item) {
 		super(new PipeTransportItems(), item);

common/buildcraft/transport/pipes/PipeItemsSandstone.java

@@ -22,7 +22,7 @@ import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeIconProvider;
 import buildcraft.transport.PipeTransportItems;
 
-public class PipeItemsSandstone extends Pipe implements IPipeConnectionForced {
+public class PipeItemsSandstone extends Pipe<PipeTransportItems> implements IPipeConnectionForced {
 
 	public PipeItemsSandstone(Item item) {
 		super(new PipeTransportItems(), item);

common/buildcraft/transport/pipes/PipeItemsStone.java

@@ -22,7 +22,7 @@ import buildcraft.transport.TransportConstants;
 import buildcraft.transport.TravelingItem;
 import buildcraft.transport.pipes.events.PipeEventItem;
 
-public class PipeItemsStone extends Pipe {
+public class PipeItemsStone extends Pipe<PipeTransportItems> {
 
 	public PipeItemsStone(Item item) {
 		super(new PipeTransportItems(), item);

common/buildcraft/transport/pipes/PipeStructureCobblestone.java

@@ -19,7 +19,7 @@ import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeIconProvider;
 import buildcraft.transport.PipeTransportStructure;
 
-public class PipeStructureCobblestone extends Pipe {
+public class PipeStructureCobblestone extends Pipe<PipeTransportStructure> {
 
 	public PipeStructureCobblestone(Item item) {
 		super(new PipeTransportStructure(), item);

common/buildcraft/transport/utils/ConnectionMatrix.java

@@ -8,8 +8,6 @@
  */
 package buildcraft.transport.utils;
 
-import java.util.Set;
-
 import io.netty.buffer.ByteBuf;
 
 import net.minecraftforge.common.util.ForgeDirection;
@@ -18,14 +16,7 @@ public class ConnectionMatrix {
 	private int mask = 0;
 	private boolean dirty = false;
 
-	private Set s;
-
 	public ConnectionMatrix() {
-		s = getSet();
-	}
-
-	public static Set getSet() {
-		return null;
 	}
 
 	public boolean isConnected(ForgeDirection direction) {