Clean up

archaic/src/main/java/resonantinduction/archaic/CommonProxy.java

@@ -1,9 +1,6 @@
 package resonantinduction.archaic;
 
-import resonantinduction.archaic.channel.RenderChannel;
-import resonantinduction.archaic.channel.TileChannel;
 import calclavia.lib.prefab.ProxyBase;
-import cpw.mods.fml.client.registry.ClientRegistry;
 
 public class CommonProxy extends ProxyBase
 {

archaic/src/main/java/resonantinduction/archaic/channel/BlockChannel.java

@@ -11,9 +11,11 @@ import calclavia.lib.utility.FluidUtility;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-/** Early tier version of the basic pipe. Open on the top, and can't support pressure.
+/**
+ * Early tier version of the basic pipe. Open on the top, and can't support pressure.
  * 
- * @author Darkguardsman */
+ * @author Darkguardsman
+ */
 public class BlockChannel extends BlockFluidNetwork
 {
 	public BlockChannel(int id)

archaic/src/main/java/resonantinduction/archaic/channel/RenderChannel.java

@@ -4,7 +4,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
-import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.opengl.GL11;

archaic/src/main/java/resonantinduction/archaic/channel/TileChannel.java

@@ -7,12 +7,10 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
-import resonantinduction.api.mechanical.fluid.IFluidConnector;
 import resonantinduction.api.mechanical.fluid.IFluidNetwork;
 import resonantinduction.api.mechanical.fluid.IFluidPipe;
 import resonantinduction.core.prefab.fluid.PipeNetwork;
 import resonantinduction.core.prefab.fluid.TileFluidNetwork;
-import resonantinduction.mechanical.fluid.tank.TileTank;
 import calclavia.lib.multiblock.fake.IBlockActivate;
 import calclavia.lib.utility.WrenchUtility;
 

archaic/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java

@@ -123,7 +123,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei
 						String name = ((TileMaterial) dustTile).name;
 						int meta = worldObj.getBlockMetadata(xCoord, yCoord + 1, zCoord);
 
-						if (heatEnergy >= getMeltIronEnergy(((float) meta / 8f) * 1000))
+						if (heatEnergy >= getMeltIronEnergy((meta / 8f) * 1000))
 						{
 							// TODO: Make refined dust yield more molten fluid than normal dust.
 							worldObj.setBlock(xCoord, yCoord + 1, zCoord, ResourceGenerator.getFluidMaterial(name).blockID, meta, 3);

archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java

@@ -6,7 +6,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import resonantinduction.core.Reference;
 import universalelectricity.api.vector.Vector3;

electrical/src/main/java/resonantinduction/electrical/ClientProxy.java

@@ -3,7 +3,6 @@ package resonantinduction.electrical;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import net.minecraftforge.client.MinecraftForgeClient;
 import resonantinduction.electrical.battery.RenderBattery;
 import resonantinduction.electrical.battery.TileBattery;
 import resonantinduction.electrical.charger.RenderCharger;

electrical/src/main/java/resonantinduction/electrical/battery/RenderBattery.java

@@ -39,6 +39,7 @@ public class RenderBattery extends TileEntitySpecialRenderer implements ISimpleI
 	public static final ResourceLocation TEXTURE_CASE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "battery/bat_case_tex.png");
 	public static final WavefrontObject MODEL = (WavefrontObject) AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "battery/battery.obj");
 
+	@Override
 	public void renderInventoryItem(ItemStack itemStack)
 	{
 		glPushMatrix();

electrical/src/main/java/resonantinduction/electrical/battery/TileBattery.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.ResonantInduction;
 import universalelectricity.api.UniversalElectricity;
@@ -13,11 +12,8 @@ import universalelectricity.api.electricity.IVoltageOutput;
 import universalelectricity.api.energy.EnergyStorageHandler;
 import universalelectricity.api.energy.IEnergyContainer;
 import universalelectricity.api.energy.IEnergyInterface;
-import universalelectricity.api.net.IConnector;
-import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.IPacketReceiver;
 import calclavia.lib.network.IPacketSender;
-import calclavia.lib.prefab.tile.TileElectrical;
 
 import com.google.common.io.ByteArrayDataInput;
 
@@ -51,7 +47,7 @@ public class TileBattery extends TileEnergyDistribution implements IVoltageInput
 	 */
 	public static long getEnergyForTier(int tier)
 	{
-		return (long) Math.pow(100000000, ((float) tier / (float) (MAX_TIER + 0.25f)) + 1);
+		return (long) Math.pow(100000000, (tier / (MAX_TIER + 0.25f)) + 1);
 	}
 
 	@Override

electrical/src/main/java/resonantinduction/electrical/charger/RenderCharger.java

@@ -8,9 +8,11 @@ import universalelectricity.api.energy.UnitDisplay.Unit;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.render.RenderUtility;
 
-/** Renderer for electric item charger
+/**
+ * Renderer for electric item charger
  * 
- * @author DarkGuardsman */
+ * @author DarkGuardsman
+ */
 public class RenderCharger extends RenderItemOverlayTile
 {
 
@@ -40,7 +42,7 @@ public class RenderCharger extends RenderItemOverlayTile
 			{
 				long energy = CompatibilityModule.getEnergyItem(((TileCharger) tile).getStackInSlot(0));
 				long maxEnergy = CompatibilityModule.getMaxEnergyItem(((TileCharger) tile).getStackInSlot(0));
-                RenderUtility.renderText(UnitDisplay.getDisplay(energy, Unit.JOULES,2,true)  + "/" + UnitDisplay.getDisplay(maxEnergy, Unit.JOULES,2,true), ((TileCharger) tile).getDirection(), 0.02f, x + d.x, y + d.y + 0.4, z + d.z);               
+				RenderUtility.renderText(UnitDisplay.getDisplay(energy, Unit.JOULES, 2, true) + "/" + UnitDisplay.getDisplay(maxEnergy, Unit.JOULES, 2, true), ((TileCharger) tile).getDirection(), 0.02f, x + d.x, y + d.y + 0.4, z + d.z);
 			}
 		}
 	}

electrical/src/main/java/resonantinduction/electrical/levitator/TileLevitator.java

@@ -131,7 +131,7 @@ public class TileLevitator extends TileAdvanced implements IPacketReceiver, IPac
 								item.setEntityItemStack(remains);
 							}
 
-							//TODO: Add redstone pulse?
+							// TODO: Add redstone pulse?
 						}
 					}
 				}
@@ -447,11 +447,13 @@ public class TileLevitator extends TileAdvanced implements IPacketReceiver, IPac
 		return null;
 	}
 
+	@Override
 	public ForgeDirection getDirection()
 	{
 		return ForgeDirection.getOrientation(getBlockType() != null ? getBlockMetadata() : 0);
 	}
 
+	@Override
 	public void setDirection(ForgeDirection side)
 	{
 		this.worldObj.setBlockMetadataWithNotify(this.xCoord, this.yCoord, this.zCoord, side.ordinal(), 3);

electrical/src/main/java/resonantinduction/electrical/wire/flat/PartFlatWire.java

@@ -3,7 +3,6 @@ package resonantinduction.electrical.wire.flat;
 import java.util.Arrays;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockColored;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemDye;
@@ -20,10 +19,8 @@ import org.lwjgl.opengl.GL11;
 import resonantinduction.core.MultipartUtility;
 import resonantinduction.electrical.wire.EnumWireMaterial;
 import resonantinduction.electrical.wire.PartAdvancedWire;
-import calclavia.lib.render.EnumColor;
 import codechicken.lib.colour.Colour;
 import codechicken.lib.colour.ColourARGB;
-import codechicken.lib.colour.ColourRGBA;
 import codechicken.lib.data.MCDataInput;
 import codechicken.lib.data.MCDataOutput;
 import codechicken.lib.lighting.LazyLightMatrix;

electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java

@@ -23,7 +23,6 @@ import universalelectricity.api.energy.IConductor;
 import universalelectricity.api.energy.IEnergyNetwork;
 import universalelectricity.api.vector.Vector3;
 import codechicken.lib.lighting.LazyLightMatrix;
-import codechicken.lib.raytracer.IndexedCuboid6;
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.IconTransformation;
 import codechicken.lib.render.RenderUtils;
@@ -34,9 +33,7 @@ import codechicken.microblock.IHollowConnect;
 import codechicken.multipart.JIconHitEffects;
 import codechicken.multipart.JNormalOcclusion;
 import codechicken.multipart.MultiPartRegistry;
-import codechicken.multipart.NormalOcclusionTest;
 import codechicken.multipart.PartMap;
-import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TSlottedPart;
 import codechicken.multipart.TileMultipart;
 import cpw.mods.fml.relauncher.Side;
@@ -101,6 +98,7 @@ public class PartFramedWire extends PartFramedConnection<EnumWireMaterial, ICond
 		return super.activate(player, part, item);
 	}
 
+	@Override
 	public void preparePlacement(int meta)
 	{
 		this.setMaterial(meta);
@@ -178,6 +176,7 @@ public class PartFramedWire extends PartFramedConnection<EnumWireMaterial, ICond
 		return RenderFramedWire.breakIcon;
 	}
 
+	@Override
 	protected boolean canConnectTo(TileEntity tile)
 	{
 		return tile instanceof IConductor || this.canConnectToObj(tile);
@@ -207,6 +206,7 @@ public class PartFramedWire extends PartFramedConnection<EnumWireMaterial, ICond
 		return false;
 	}
 
+	@Override
 	public IConductor getConnector(TileEntity tile)
 	{
 		if (tile instanceof IConductor)

electrical/src/main/java/resonantinduction/electrical/wire/framed/RenderFramedWire.java

@@ -13,6 +13,7 @@ import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.core.Reference;
+import resonantinduction.core.prefab.part.PartFramedConnection;
 import resonantinduction.core.render.InvertX;
 import codechicken.lib.colour.Colour;
 import codechicken.lib.colour.ColourARGB;
@@ -115,7 +116,7 @@ public class RenderFramedWire
 
 			for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
 			{
-				if (PartFramedWire.connectionMapContainsSide(renderSides, side))
+				if (PartFramedConnection.connectionMapContainsSide(renderSides, side))
 					renderSideShine(side, wire);
 			}
 			CCRenderState.draw();
@@ -150,7 +151,7 @@ public class RenderFramedWire
 
 		for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
 		{
-			if (PartFramedWire.connectionMapContainsSide(renderSides, side))
+			if (PartFramedConnection.connectionMapContainsSide(renderSides, side))
 			{
 				renderSide(side, wire);
 			}

mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/ModelPipe.java

@@ -1,7 +1,5 @@
 package resonantinduction.mechanical.fluid.pipe;
 
-import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraftforge.common.ForgeDirection;

mechanical/src/main/java/resonantinduction/mechanical/gear/GearMultiBlockHandler.java

@@ -3,7 +3,6 @@ package resonantinduction.mechanical.gear;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.api.vector.Vector3;
-import calclavia.lib.multiblock.reference.IMultiBlockStructure;
 import calclavia.lib.multiblock.reference.MultiBlockHandler;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;

mechanical/src/main/java/resonantinduction/mechanical/gear/PartGear.java

@@ -9,7 +9,6 @@ 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 net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;

mechanical/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java

@@ -79,7 +79,7 @@ public class MechanicalNetwork extends Network<IMechanicalNetwork, IMechanical>
 
 					if (adjacentMech != null && adjacent != mechanical)
 					{
-						//System.out.println("UPDATING: " + mechanical + " with " + adjacentMech);
+						// System.out.println("UPDATING: " + mechanical + " with " + adjacentMech);
 						float ratio = adjacentMech.getRatio(dir.getOpposite(), mechanical) / mechanical.getRatio(dir, adjacentMech);
 						long torque = mechanical.getTorque();
 

mechanical/src/main/java/resonantinduction/mechanical/process/purifier/RenderMixer.java

@@ -52,7 +52,7 @@ public class RenderMixer extends TileEntitySpecialRenderer implements ISimpleIte
 	{
 		glPushMatrix();
 		GL11.glScalef(0.5f, 0.5f, 0.5f);
-		glTranslatef((float) 0.5F, (float) 0.5f, (float) 1.5F);
+		glTranslatef(0.5F, 0.5f, 1.5F);
 		RenderUtility.bind(TEXTURE);
 		MODEL.renderAll();
 		glPopMatrix();

mechanical/src/main/java/resonantinduction/mechanical/turbine/BlockWindTurbine.java

@@ -20,6 +20,7 @@ public class BlockWindTurbine extends BlockTurbine
 		rotationMask = Byte.parseByte("111111", 2);
 	}
 
+	@Override
 	public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
 	{
 		if (entityPlayer.getCurrentEquippedItem() == null)
@@ -41,6 +42,7 @@ public class BlockWindTurbine extends BlockTurbine
 		return false;
 	}
 
+	@Override
 	public boolean onSneakMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
 	{
 		TileEntity tileEntity = world.getBlockTileEntity(x, y, z);

mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWaterTurbine.java

@@ -1,18 +1,6 @@
 package resonantinduction.mechanical.turbine;
 
 import net.minecraft.block.Block;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.ForgeDirection;
-import resonantinduction.api.mechanical.IMechanical;
-import resonantinduction.api.mechanical.IMechanicalNetwork;
-import resonantinduction.core.ResonantInduction;
-import resonantinduction.mechanical.gear.PartGearShaft;
-import resonantinduction.mechanical.network.MechanicalNetwork;
-import universalelectricity.api.vector.Vector3;
-import calclavia.lib.network.PacketHandler;
-import calclavia.lib.prefab.turbine.TileTurbine;
 
 /**
  * The vertical wind turbine collects airflow.

mechanical/src/main/java/resonantinduction/mechanical/turbine/TileWindTurbine.java

@@ -3,7 +3,6 @@ package resonantinduction.mechanical.turbine;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.BiomeGenOcean;
 import net.minecraft.world.biome.BiomeGenPlains;
-import net.minecraftforge.common.ForgeDirection;
 
 /**
  * The vertical wind turbine collects airflow.

src/main/java/resonantinduction/core/prefab/fluid/FluidNetwork.java

@@ -38,7 +38,7 @@ public abstract class FluidNetwork extends NodeNetwork<IFluidNetwork, IFluidConn
 	@Override
 	public void update()
 	{
-	    //TODO change to distribute fluid 
+		// TODO change to distribute fluid
 	}
 
 	@Override

src/main/java/resonantinduction/core/prefab/fluid/TileFluidNetwork.java

@@ -18,7 +18,6 @@ import resonantinduction.api.IInformation;
 import resonantinduction.api.mechanical.fluid.IFluidConnector;
 import resonantinduction.api.mechanical.fluid.IFluidNetwork;
 import resonantinduction.core.ResonantInduction;
-import resonantinduction.mechanical.Mechanical;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.IPacketReceiverWithID;
 import calclavia.lib.network.PacketHandler;

src/main/java/resonantinduction/core/resource/fluid/TileFluidMixture.java

@@ -14,6 +14,7 @@ import resonantinduction.core.resource.TileMaterial;
 
 /**
  * NO-OP. Not yet properly implemented. We're not using TEs for now.
+ * 
  * @author Calclavia
  * 
  */