Cleaup

src/dark/api/IAimable.java

@@ -12,7 +12,7 @@ public interface IAimable
      * but no farther than that. */
     public Vector3 getLook();
 
-    /** X pitch, Y is yaw, z is roll. Roll is almost never used*/
+    /** X pitch, Y is yaw, z is roll. Roll is almost never used */
     public Vector3 getRotation();
 
     /** This does not set the rotation but rather moves the current rotation by the given values */

src/dark/api/ITerminalCommand.java

@@ -2,7 +2,6 @@ package dark.api;
 
 import java.util.Set;
 
-
 import net.minecraft.entity.player.EntityPlayer;
 
 /** Prefab for creating commands that most terminal entities can use

src/dark/api/access/GroupRegistry.java

@@ -5,11 +5,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
 
+import net.minecraft.entity.player.EntityPlayer;
 import dark.api.ITerminal;
 import dark.api.ITerminalCommand;
 
-import net.minecraft.entity.player.EntityPlayer;
-
 /** @author DarkGuardsman */
 public class GroupRegistry
 {
@@ -18,7 +17,6 @@ public class GroupRegistry
     public static final HashMap<String, List<String>> groupDefaultNodes = new HashMap();
     public static final HashMap<String, String> groupDefaultExtends = new HashMap();
 
-    
     static
     {
         List<String> list = new ArrayList<String>();

src/dark/api/access/IProfileContainer.java

@@ -1,7 +1,7 @@
 package dark.api.access;
 
-/** Applied to tileEntities that contain an access profile that describes how the tile interacts
- * with users
+/** Applied to tileEntities that contain an access profile that describes how the tile interacts with
+ * users
  * 
  * @author DarkGuardsman */
 public interface IProfileContainer

src/dark/api/access/Nodes.java

@@ -1,6 +1,5 @@
 package dark.api.access;
 
-
 /** Constants that represent nodes by which machines and entities used in combination with
  * ISpecialAccess to limit users on what they can do. These nodes should be used in the same way by
  * all machines, entities, and other mods. Too change the meaning of the node will make it difficult

src/dark/api/energy/IEnergyDevice.java

@@ -5,5 +5,4 @@ import dark.api.tilenetwork.ITileConnector;
 public interface IEnergyDevice extends ITileConnector
 {
 
-    
 }

src/dark/api/save/IVirtualObject.java

@@ -15,5 +15,4 @@ public interface IVirtualObject extends ISaveObj
      * loaded from and decide if it wants to use the location as its getSaveFile return */
     public void setSaveFile(File file);
 
-
 }

src/dark/core/prefab/ItemBasic.java

@@ -2,7 +2,6 @@ package dark.core.prefab;
 
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.Item;
-import net.minecraft.util.Icon;
 import net.minecraftforge.common.Configuration;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/dark/core/prefab/ModPrefab.java

@@ -10,9 +10,6 @@ import net.minecraftforge.common.MinecraftForge;
 
 import org.modstats.Modstats;
 
-import universalelectricity.compatibility.Compatibility;
-import universalelectricity.core.UniversalElectricity;
-
 import com.builtbroken.common.Triple;
 
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -20,15 +17,8 @@ import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.TickRegistry;
 import cpw.mods.fml.relauncher.Side;
-import dark.api.save.SaveManager;
 import dark.core.CoreMachine;
-import dark.core.ExternalModHandler;
-import dark.core.ModObjectRegistry;
-import dark.core.PlayerKeyHandler;
-import dark.core.prefab.fluids.FluidHelper;
-import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
 
 public abstract class ModPrefab
 {

src/dark/core/prefab/invgui/GuiMessageBox.java

@@ -70,8 +70,8 @@ public class GuiMessageBox extends GuiBase
     @Override
     protected void drawForegroundLayer(int var2, int var3, float var1)
     {
-        this.fontRenderer.drawString("" + this.title, (int) (this.guiSize.intX() / 2 - 30), 5, 4210752);
-        this.fontRenderer.drawString("\u00a77" + this.message, (int) ((this.guiSize.intX() / 2) - 50), 20, 4210752);
+        this.fontRenderer.drawString("" + this.title, (this.guiSize.intX() / 2 - 30), 5, 4210752);
+        this.fontRenderer.drawString("\u00a77" + this.message, ((this.guiSize.intX() / 2) - 50), 20, 4210752);
     }
 
     @Override

src/dark/core/prefab/machine/TileEntityMachine.java

@@ -18,8 +18,8 @@ import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
 import dark.api.IDisableable;
 import dark.core.interfaces.IExternalInv;
-import dark.core.interfaces.IInvBox;
 import dark.core.interfaces.IExtraInfo.IExtraTileEntityInfo;
+import dark.core.interfaces.IInvBox;
 import dark.core.network.ISimplePacketReceiver;
 import dark.core.network.PacketHandler;
 import dark.machines.DarkMain;

src/dark/core/prefab/terminal/TileEntityTerminal.java

@@ -16,7 +16,6 @@ import dark.api.ITerminal;
 import dark.api.access.GroupRegistry;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
-import dark.core.prefab.machine.TileEntityMachine.SimplePacketTypes;
 
 /** @author Calclavia, DarkGuardsman */
 public abstract class TileEntityTerminal extends TileEntityEnergyMachine implements ITerminal

src/dark/core/prefab/tilenetwork/NetworkSharedPower.java

@@ -116,7 +116,7 @@ public class NetworkSharedPower extends NetworkTileEntities implements IElectric
     public void setEnergyStored(float energy)
     {
         this.energy = energy;
-        if(this.energy > this.getMaxEnergyStored())
+        if (this.energy > this.getMaxEnergyStored())
         {
             this.energy = this.getMaxEnergyStored();
         }

src/dark/machines/CoreRecipeLoader.java

@@ -11,13 +11,13 @@ import dark.api.IToolReadOut.EnumTools;
 import dark.api.reciepes.MachineRecipeHandler;
 import dark.api.reciepes.ProcessorType;
 import dark.core.basics.BlockOre;
+import dark.core.basics.BlockOre.OreData;
 import dark.core.basics.EnumMaterial;
 import dark.core.basics.EnumOrePart;
 import dark.core.basics.EnumTool;
 import dark.core.basics.ItemCommonTool;
 import dark.core.basics.ItemOreDirv;
 import dark.core.basics.ItemParts;
-import dark.core.basics.BlockOre.OreData;
 import dark.core.basics.ItemParts.Parts;
 import dark.core.prefab.RecipeLoader;
 import dark.machines.deco.BlockBasalt;

src/dark/machines/DarkMain.java

@@ -38,6 +38,7 @@ import dark.core.DMCreativeTab;
 import dark.core.ModObjectRegistry;
 import dark.core.basics.BlockGasOre;
 import dark.core.basics.BlockOre;
+import dark.core.basics.BlockOre.OreData;
 import dark.core.basics.EnumMaterial;
 import dark.core.basics.EnumOrePart;
 import dark.core.basics.GasOreGenerator;
@@ -45,7 +46,6 @@ import dark.core.basics.ItemBlockOre;
 import dark.core.basics.ItemCommonTool;
 import dark.core.basics.ItemOreDirv;
 import dark.core.basics.ItemParts;
-import dark.core.basics.BlockOre.OreData;
 import dark.core.basics.ItemParts.Parts;
 import dark.core.helpers.PacketDataWatcher;
 import dark.core.network.PacketHandler;

src/dark/machines/client/models/ModelElecFurnace.java

@@ -68,6 +68,7 @@ public class ModelElecFurnace extends ModelMachine
         setRotation(tube3, 0F, 0F, 0F);
     }
 
+    @Override
     public void render(float f5)
     {
         body.render(f5);

src/dark/machines/client/models/ModelSteamGen.java

@@ -236,6 +236,7 @@ public class ModelSteamGen extends ModelMachine
         setRotation(gaugeNeedle, -0.0174533F, 0F, -0.5759587F);
     }
 
+    @Override
     public void render(float f5)
     {
         face.render(f5);

src/dark/machines/client/models/ModelSteamTurbine.java

@@ -173,6 +173,7 @@ public class ModelSteamTurbine extends ModelMachine
         setRotation(gaugeDieal, 0F, 0F, -2.80998F);
     }
 
+    @Override
     public void render(float f5)
     {
         base.render(f5);

src/dark/machines/client/renders/ItemRenderFluidCan.java

@@ -76,7 +76,7 @@ public class ItemRenderFluidCan implements IItemRenderer
                 FMLClientHandler.instance().getClient().renderEngine.bindTexture((RenderBlockFluid.getFluidSheet(liquid)));
 
                 int cap = ((ItemFluidCan) CoreRecipeLoader.itemFluidCan).getCapacity(item);
-                if(liquid.getFluid().isGaseous())
+                if (liquid.getFluid().isGaseous())
                 {
                     cap = liquid.amount;
                 }

src/dark/machines/client/renders/RenderSteamGen.java

@@ -66,7 +66,7 @@ public class RenderSteamGen extends RenderTileMachine
                 {
                     if (((TileEntityMachine) tileEntity).isFunctioning())
                     {
-                        GL11.glRotatef(this.rot1, 0f, 1f, 0f);
+                        GL11.glRotatef(RenderSteamGen.rot1, 0f, 1f, 0f);
                     }
                     ((ModelSteamTurbine) model).renderFan(0.0625F);
                 }

src/dark/machines/generators/BlockSmallSteamGen.java

@@ -46,7 +46,7 @@ public class BlockSmallSteamGen extends BlockMachine
     {
         super.onBlockPlacedBy(world, x, y, z, entityLiving, itemStack);
         int metadata = world.getBlockMetadata(x, y, z);
-        int angle = MathHelper.floor_double((entityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
+        int angle = net.minecraft.util.MathHelper.floor_double((entityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
         world.setBlockMetadataWithNotify(x, y, z, ((metadata / 4) * 4) + angle, 3);
     }
 

src/dark/machines/generators/TileEntitySteamPiston.java

@@ -56,6 +56,7 @@ public class TileEntitySteamPiston extends TileEntityEnergyMachine
         return this.wattsOut;
     }
 
+    @Override
     public boolean consumePower(float watts, boolean doDrain)
     {
         return true;
@@ -73,11 +74,13 @@ public class TileEntitySteamPiston extends TileEntityEnergyMachine
 
     }
 
+    @Override
     public EnumSet<ForgeDirection> getInputDirections()
     {
         return EnumSet.noneOf(ForgeDirection.class);
     }
 
+    @Override
     public EnumSet<ForgeDirection> getOutputDirections()
     {
         return EnumSet.allOf(ForgeDirection.class);

src/dark/machines/machines/BlockEnergyStorage.java

@@ -35,6 +35,7 @@ public class BlockEnergyStorage extends BlockMachine
         this.setCreativeTab(DMCreativeTab.tabIndustrial);
     }
 
+    @Override
     public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side)
     {
         Vector3 vec = new Vector3(x, y, z);

src/dark/machines/machines/ItemBlockEnergyStorage.java

@@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
 import universalelectricity.core.vector.Vector3;
 import dark.machines.CoreRecipeLoader;
 
@@ -90,6 +89,7 @@ public class ItemBlockEnergyStorage extends ItemBlock
         return itemStack;
     }
 
+    @Override
     public int getItemStackLimit(ItemStack stack)
     {
         if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("wrenched"))

src/dark/machines/machines/TileEntityInfLoad.java

@@ -1,6 +1,5 @@
 package dark.machines.machines;
 
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.ForgeDirection;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
 

src/dark/machines/machines/TileEntityInfSupply.java

@@ -2,7 +2,6 @@ package dark.machines.machines;
 
 import java.util.EnumSet;
 
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.ForgeDirection;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
 

src/dark/machines/machines/TileEntityVoid.java

@@ -2,7 +2,6 @@ package dark.machines.machines;
 
 import java.util.HashMap;
 
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;