CleanUp

src/com/builtbroken/common/TextHelper.java

@@ -35,7 +35,7 @@ public final class TextHelper
         }
 
         /** Retrieves the Hexadecimal integer value for the specified Color
-         *
+         * 
          * @return The Hexadecimal int for the Color **/
         public int getHexValue()
         {
@@ -43,7 +43,7 @@ public final class TextHelper
         }
 
         /** Retrieves the <code>java.awt.Color</code> instance for the Color
-         *
+         * 
          * @return the java.awt.Color instance for this color ***/
         public Color getColor()
         {
@@ -51,7 +51,7 @@ public final class TextHelper
         }
 
         /** Retrieves the String that specifies the color of Text within Minecraft
-         *
+         * 
          * @return String that can be added to the beginning of another String to specify coloration
          * in Minecraft **/
         public String getColorString()
@@ -61,7 +61,7 @@ public final class TextHelper
 
         /** Retrieves an int Array to retrieve the RGB values for the specified Color. Index 0 is the
          * Red value, Index 1 is the Green value, and Index 2 is the Blue value.
-         *
+         * 
          * @return Array of the primitive type int containing the RGB values for the specified color **/
         public int[] getRGBIntArray()
         {

src/dark/core/DarkCoreModContainer.java

@@ -23,12 +23,12 @@ public class DarkCoreModContainer extends DummyModContainer
     {
         super(new ModMetadata());
         ModMetadata meta = getMetadata();
-        meta.modId       = "DarkCoreLoader";
-        meta.name        = "Dark Core Loader";
-        meta.version     = DarkMain.VERSION;
-        meta.authorList  = Arrays.asList("DarkGuardsman aka DarkCow");
+        meta.modId = "DarkCoreLoader";
+        meta.name = "Dark Core Loader";
+        meta.version = DarkMain.VERSION;
+        meta.authorList = Arrays.asList("DarkGuardsman aka DarkCow");
         meta.description = "Core mod loader and asm transformer for Dark's Core Machine.";
-        meta.url         = "www.BuiltBroken.com";
+        meta.url = "www.BuiltBroken.com";
     }
 
     @Override

src/dark/core/client/ClientProxy.java

@@ -7,21 +7,15 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.client.renders.BlockRenderingHandler;
-import dark.core.client.renders.RenderBlockSolarPanel;
-import dark.core.client.renders.RenderBlockWire;
 import dark.core.common.CommonProxy;
-import dark.core.common.CoreRecipeLoader;
 import dark.core.common.machines.TileEntityBatteryBox;
 import dark.core.common.machines.TileEntityCoalGenerator;
 import dark.core.common.machines.TileEntityElectricFurnace;
-import dark.core.common.machines.TileEntitySolarPanel;
-import dark.core.common.transmit.TileEntityWire;
 import dark.core.prefab.ModPrefab;
 
 @SideOnly(Side.CLIENT)
@@ -29,7 +23,7 @@ public class ClientProxy extends CommonProxy
 {
 
     /** Renders a laser beam from one power to another by a set color for a set time
-     *
+     * 
      * @param world - world this laser is to be rendered in
      * @param position - start vector3
      * @param target - end vector3

src/dark/core/client/FXBeam.java

@@ -19,7 +19,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.common.DarkMain;
 
 /** Based off Thaumcraft's Beam Renderer.
- *
+ * 
  * @author Calclavia, Azanor */
 @SideOnly(Side.CLIENT)
 public class FXBeam extends EntityFX

src/dark/core/client/renders/RenderBlockEntity.java

@@ -18,7 +18,6 @@ public class RenderBlockEntity extends Render
 
     public static RenderBlockEntity INSTANCE = new RenderBlockEntity();
 
-
     private RenderBlockEntity()
     {
     }

src/dark/core/client/renders/RenderTileMachine.java

@@ -5,7 +5,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.prefab.machine.BlockMachine;
 
 @SideOnly(Side.CLIENT)
 public abstract class RenderTileMachine extends TileEntitySpecialRenderer
@@ -25,7 +24,7 @@ public abstract class RenderTileMachine extends TileEntitySpecialRenderer
     public abstract void renderModel(TileEntity tileEntity, double x, double y, double z, float size);
 
     /** Sudo method for setting the texture for current render
-     *
+     * 
      * @param name */
     public void bindTextureByName(String domain, String name)
     {

src/dark/core/common/debug/IDebugTile.java

@@ -5,5 +5,4 @@ import dark.core.interfaces.IBlockActivated;
 public interface IDebugTile extends IBlockActivated
 {
 
-
 }

src/dark/core/common/debug/TileEntityVoid.java

@@ -12,7 +12,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 
 /** Designed to debug fluid devices by draining everything that comes in at one time
- *
+ * 
  * @author DarkGuardsman */
 public class TileEntityVoid extends TileEntity implements IFluidHandler, IDebugTile
 {

src/dark/core/common/machines/BlockSolarPanel.java

@@ -15,14 +15,9 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
 import dark.core.client.renders.BlockRenderingHandler;
 import dark.core.client.renders.RenderBlockSolarPanel;
-import dark.core.client.renders.RenderBlockWire;
-import dark.core.common.CoreRecipeLoader;
 import dark.core.common.DMCreativeTab;
-import dark.core.common.transmit.BlockWire;
-import dark.core.common.transmit.TileEntityWire;
 import dark.core.prefab.machine.BlockMachine;
 import dark.core.registration.ModObjectRegistry.BlockBuildData;
 

src/dark/core/common/machines/TileEntityBatteryBox.java

@@ -1,16 +1,16 @@
 package dark.core.common.machines;
 
-import java.io.DataInputStream;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.google.common.io.ByteArrayDataInput;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.Packet;
 import net.minecraftforge.common.ForgeDirection;
+
+import com.google.common.io.ByteArrayDataInput;
+
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
 import dark.core.common.machines.BlockBasicMachine.BasicMachineData;

src/dark/core/common/machines/TileEntityCoalGenerator.java

@@ -8,9 +8,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.electricity.ElectricityPack;
 

src/dark/core/common/machines/TileEntityElectricFurnace.java

@@ -1,9 +1,5 @@
 package dark.core.common.machines;
 
-import java.io.DataInputStream;
-
-import com.google.common.io.ByteArrayDataInput;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
@@ -11,6 +7,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.item.IItemElectric;
+
+import com.google.common.io.ByteArrayDataInput;
+
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
 import cpw.mods.fml.common.registry.LanguageRegistry;

src/dark/core/common/machines/TileEntitySolarPanel.java

@@ -3,14 +3,9 @@ package dark.core.common.machines;
 import java.util.EnumSet;
 
 import micdoodle8.mods.galacticraft.API.ISolarLevel;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.electricity.ElectricityPack;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.renders.RenderBlockSolarPanel;
-import dark.core.common.CoreRecipeLoader;
 import dark.core.prefab.machine.TileEntityEnergyMachine;
 
 public class TileEntitySolarPanel extends TileEntityEnergyMachine

src/dark/core/common/transmit/BlockWire.java

@@ -22,9 +22,7 @@ import com.builtbroken.common.Pair;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import dark.api.ColorCode;
 import dark.core.client.renders.RenderBlockWire;
-import dark.core.common.CoreRecipeLoader;
 import dark.core.common.DMCreativeTab;
 import dark.core.common.DarkMain;
 import dark.core.prefab.machine.BlockMachine;

src/dark/core/common/transmit/ItemBlockWire.java

@@ -12,6 +12,7 @@ public class ItemBlockWire extends ItemBlockHolder
         super(id);
     }
 
+    @Override
     public Icon getIconFromDamage(int par1)
     {
         return CoreRecipeLoader.blockWire instanceof BlockWire ? ((BlockWire) CoreRecipeLoader.blockWire).wireIcon : CoreRecipeLoader.blockWire.getIcon(0, par1);

src/dark/core/common/transmit/TileEntityWire.java

@@ -1,12 +1,7 @@
 package dark.core.common.transmit;
 
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraftforge.common.Configuration;
 import universalelectricity.compatibility.TileEntityUniversalConductor;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import dark.core.client.renders.RenderBlockWire;
-import dark.core.common.CoreRecipeLoader;
 import dark.core.prefab.IExtraInfo.IExtraTileEntityInfo;
 
 public class TileEntityWire extends TileEntityUniversalConductor implements IExtraTileEntityInfo
@@ -25,8 +20,6 @@ public class TileEntityWire extends TileEntityUniversalConductor implements IExt
         return BlockWire.ampMax;
     }
 
-
-
     @Override
     public boolean hasExtraConfigs()
     {

src/dark/core/network/ISimplePacketReceiver.java

@@ -1,21 +1,17 @@
 package dark.core.network;
 
-import java.io.DataInputStream;
-
 import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
 
-import net.minecraft.entity.player.EntityPlayer;
-
 /** Simplified version of IPackerReceiver for tiles that only need a packet ID, data, and player
  * Reference
- *
+ * 
  * @author DarkGuardsman */
 public interface ISimplePacketReceiver
 {
     /** Simplified version of IPacketReceiver's HandlePacketData
-     *
+     * 
      * @param id - packet ID as a string
      * @param data - data from the packet, after location has been read
      * @param player - player that the packet was sent to or came from

src/dark/core/prefab/IExtraInfo.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 /** Used to handle info about the block that would normally be handled by the mod main class. Use the
  * BlockRegistry in order for these methods to be called on load of the mod.
- *
+ * 
  * @author DarkGuardsman */
 public interface IExtraInfo
 {

src/dark/core/prefab/helpers/ConnectionHelper.java

@@ -9,7 +9,7 @@ public class ConnectionHelper
 {
     /** Used to find all tileEntities sounding the location you will have to filter for selective
      * tileEntities
-     *
+     * 
      * @param world - the world being searched threw
      * @param x
      * @param y

src/dark/core/prefab/helpers/ItemWorldHelper.java

@@ -21,7 +21,7 @@ public class ItemWorldHelper
     }
 
     /** Gets all EntityItems in an area and sorts them by a list of itemStacks
-     *
+     * 
      * @param world - world being worked in
      * @param start - start point
      * @param end - end point
@@ -68,7 +68,7 @@ public class ItemWorldHelper
     }
 
     /** filter a list of itemStack to another list of itemStacks
-     *
+     * 
      * @param totalItems - full list of items being filtered
      * @param desiredItems - list the of item that are being filtered too
      * @return a list of item from the original that are wanted */
@@ -91,7 +91,7 @@ public class ItemWorldHelper
     }
 
     /** grabs all the items that the block can drop then pass them onto dropBlockAsItem_do
-     *
+     * 
      * @param world
      * @param x
      * @param y

src/dark/core/prefab/helpers/MathHelper.java

@@ -7,7 +7,7 @@ import universalelectricity.core.vector.Vector3;
 public class MathHelper extends net.minecraft.util.MathHelper
 {
     /** Generates an array of random numbers
-     *
+     * 
      * @param random - random instance to be used
      * @param maxNumber - max size of the int to use
      * @param arraySize - length of the array
@@ -18,7 +18,7 @@ public class MathHelper extends net.minecraft.util.MathHelper
     }
 
     /** Generates an array of random numbers
-     *
+     * 
      * @param random - random instance to be used
      * @param minNumber - smallest random Integer to use. Warning can lead to longer than normal
      * delay in returns
@@ -54,7 +54,7 @@ public class MathHelper extends net.minecraft.util.MathHelper
     }
 
     /** Turns radius and sphere cords into a vector3
-     *
+     * 
      * @param radius - sphere radius
      * @param inclination -
      * @param azimuth

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

@@ -15,7 +15,6 @@ import universalelectricity.prefab.block.BlockTile;
 
 import com.builtbroken.common.Pair;
 
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.api.parts.INetworkPart;
@@ -28,7 +27,7 @@ import dark.core.registration.ModObjectRegistry.BlockBuildData;
 /** Basic TileEntity Container class designed to be used by generic machines. It is suggested that
  * each mod using this create there own basic block extending this to reduce need to use build data
  * per block.
- *
+ * 
  * @author Darkguardsman */
 public abstract class BlockMachine extends BlockTile implements IExtraBlockInfo
 {

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

@@ -44,6 +44,7 @@ public class BlockMulti extends BlockContainer implements IExtraBlockInfo
         return this;
     }
 
+    @Override
     public BlockMulti setTextureName(String name)
     {
         this.textureName = name;

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

@@ -15,7 +15,6 @@ import universalelectricity.prefab.tile.IRotatable;
 import com.google.common.io.ByteArrayDataInput;
 
 import cpw.mods.fml.common.network.Player;
-
 import dark.api.IDisableable;
 import dark.core.common.DarkMain;
 import dark.core.interfaces.IExternalInv;

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

@@ -1,17 +1,15 @@
 package dark.core.prefab.terminal;
 
-import java.io.DataInputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.google.common.io.ByteArrayDataInput;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.util.AxisAlignedBB;
-import universalelectricity.prefab.network.IPacketReceiver;
+
+import com.google.common.io.ByteArrayDataInput;
+
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
 import dark.api.ITerminal;

src/dark/core/registration/ModObjectRegistry.java

@@ -25,7 +25,7 @@ import dark.core.prefab.ModPrefab;
 import dark.core.prefab.machine.BlockMachine;
 
 /** Handler to make registering all parts of a mod's objects that are loaded into the game by forge
- *
+ * 
  * @author DarkGuardsman */
 public class ModObjectRegistry
 {
@@ -244,7 +244,7 @@ public class ModObjectRegistry
         }
 
         /** Adds a tileEntity to be registered when this block is registered
-         *
+         * 
          * @param name - mod name for the tileEntity, should be unique
          * @param class1 - new instance of the TileEntity to register */
         public BlockBuildData addTileEntity(String name, Class<? extends TileEntity> class1)