cleanup

src/dark/api/IToolReadOut.java

@@ -1,13 +1,12 @@
 package dark.api;
 
-import dark.api.IToolReadOut.EnumTools;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.ForgeDirection;
 
 public interface IToolReadOut
 {
     /** Grabs the message displayed to the user on right click of the machine with the pipe gauge
-     *
+     * 
      * @param user
      * @param side - may not work correctly yet but should give you a side
      * @return - a string to be displayed to the player for a reading. automatically adds ReadOut:

src/dark/api/parts/INetworkEnergyPart.java

@@ -5,7 +5,7 @@ import universalelectricity.core.block.IElectricalStorage;
 /** Tiles that use NetworkSharedPower class should implements this. All methods in IElectricalStorage
  * should point to the network instead of the tile. This is why more energy methods are added to
  * this interface
- *
+ * 
  * @author DarkGuardsman */
 public interface INetworkEnergyPart extends INetworkPart, IElectricalStorage
 {

src/dark/core/client/ClientProxy.java

@@ -18,7 +18,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

@@ -17,7 +17,7 @@ import cpw.mods.fml.client.FMLClientHandler;
 import dark.core.common.DarkMain;
 
 /** Based off Thaumcraft's Beam Renderer.
- *
+ * 
  * @author Calclavia, Azanor */
 public class FXBeam extends EntityFX
 {

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

@@ -14,9 +14,8 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.opengl.GL11;
 
-import dark.core.prefab.helpers.BlockRenderInfo;
-
 import universalelectricity.core.vector.Vector3;
+import dark.core.prefab.helpers.BlockRenderInfo;
 
 /** @author CovertJaguar <railcraft.wikispaces.com> from BuildCraft , modified by DarkGuardsman */
 public class FluidBlockRenderer

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

@@ -18,11 +18,10 @@ import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
+import universalelectricity.core.vector.Vector3;
 import dark.core.prefab.helpers.BlockRenderInfo;
 import dark.core.prefab.helpers.EntityFakeBlock;
 
-import universalelectricity.core.vector.Vector3;
-
 public class RenderFakeBlock extends Render
 {
     /** Render instance */

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

@@ -1,7 +1,6 @@
 package dark.core.client.renders;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -16,7 +15,7 @@ public abstract class RenderMachine extends TileEntitySpecialRenderer
     }
 
     /** Sudo method for setting the texture for current render
-     *
+     * 
      * @param name */
     public void bindTextureByName(String domain, String name)
     {

src/dark/core/common/BlockRegistry.java

@@ -17,7 +17,7 @@ import dark.core.prefab.IExtraObjectInfo;
 import dark.core.prefab.helpers.Pair;
 
 /** Handler to make registering all parts of a block a bit easier
- *
+ * 
  * @author DarkGuardsman */
 public class BlockRegistry
 {
@@ -147,7 +147,7 @@ public class BlockRegistry
         }
 
         /** 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 BlockData addTileEntity(String name, Class<? extends TileEntity> class1)

src/dark/core/common/CommonProxy.java

@@ -26,7 +26,7 @@ public class 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/common/DarkMain.java

@@ -29,7 +29,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.registry.GameRegistry;
 import dark.core.common.BlockRegistry.BlockData;
 import dark.core.common.blocks.BlockBasalt;
 import dark.core.common.blocks.BlockColorGlass;
@@ -41,12 +40,12 @@ import dark.core.common.blocks.ItemBlockOre;
 import dark.core.common.debug.BlockDebug;
 import dark.core.common.items.EnumMeterials;
 import dark.core.common.items.ItemBattery;
-import dark.core.common.items.ItemColored;
+import dark.core.common.items.ItemColoredDust;
 import dark.core.common.items.ItemOreDirv;
 import dark.core.common.items.ItemParts;
+import dark.core.common.items.ItemParts.Parts;
 import dark.core.common.items.ItemTools;
 import dark.core.common.items.ItemWrench;
-import dark.core.common.items.ItemParts.Parts;
 import dark.core.common.transmit.BlockWire;
 import dark.core.prefab.BlockMulti;
 import dark.core.prefab.ModPrefab;
@@ -93,7 +92,6 @@ public class DarkMain extends ModPrefab
     public static final String[] dyeColorNames = new String[] { "Black", "Red", "Green", "Brown", "Blue", "Purple", "Cyan", "Silver", "Gray", "Pink", "Lime", "Yellow", "LightBlue", "Magenta", "Orange", "White" };
     public static final Color[] dyeColors = new Color[] { Color.black, Color.red, Color.green, new Color(139, 69, 19), Color.BLUE, new Color(75, 0, 130), Color.cyan, new Color(192, 192, 192), Color.gray, Color.pink, new Color(0, 255, 0), Color.yellow, new Color(135, 206, 250), Color.magenta, Color.orange, Color.white };
 
-
     public static DarkMain getInstance()
     {
         if (instance == null)
@@ -189,7 +187,6 @@ public class DarkMain extends ModPrefab
         CoreRecipeLoader.blockBasalt = new BlockBasalt(getNextID());
         CoreRecipeLoader.blockGlowGlass = new BlockColorGlass(getNextID(), "GlowGlass").setLightOpacity(2).setLightValue(1);
 
-
         // // Registration ////
         dataList.add(new BlockData(CoreRecipeLoader.blockStainGlass, ItemBlockColored.class, "stainGlass"));
         dataList.add(new BlockData(CoreRecipeLoader.blockColorSand, ItemBlockColored.class, "stainSand"));
@@ -207,8 +204,8 @@ public class DarkMain extends ModPrefab
         if (CONFIGURATION.get("general", "LoadCraftingParts", true, "Only disable this if you do not plan to craft, or are not using any mods that need these parts.").getBoolean(true))
         {
             CoreRecipeLoader.itemParts = new ItemParts(ITEM_ID_PREFIX++, CONFIGURATION);
-            CoreRecipeLoader.itemRefinedSand = new ItemColored(CONFIGURATION.getItem(Configuration.CATEGORY_ITEM, "RefinedSandItemID", ITEM_ID_PREFIX++).getInt(), "RefinedSand");
-            CoreRecipeLoader.itemGlowingSand = new ItemColored(CONFIGURATION.getItem(Configuration.CATEGORY_ITEM, "GlowingRefinedSandItemID", ITEM_ID_PREFIX++).getInt(), "GlowRefinedSand");
+            CoreRecipeLoader.itemRefinedSand = new ItemColoredDust(CONFIGURATION.getItem(Configuration.CATEGORY_ITEM, "RefinedSandItemID", ITEM_ID_PREFIX++).getInt(), "RefinedSand");
+            CoreRecipeLoader.itemGlowingSand = new ItemColoredDust(CONFIGURATION.getItem(Configuration.CATEGORY_ITEM, "GlowingRefinedSandItemID", ITEM_ID_PREFIX++).getInt(), "GlowRefinedSand");
 
         }
         if (CONFIGURATION.get("general", "EnableBattery", true).getBoolean(true))

src/dark/core/common/blocks/BlockColorSand.java

@@ -2,14 +2,14 @@ package dark.core.common.blocks;
 
 import java.util.Random;
 
-import dark.core.common.DarkMain;
-import dark.core.prefab.BlockColored;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.world.World;
+import dark.core.common.DarkMain;
+import dark.core.prefab.BlockColored;
 
+//TODO fix instant falling sand
 public class BlockColorSand extends BlockColored
 {
     public BlockColorSand(int par1)

src/dark/core/common/blocks/BlockOre.java

@@ -1,6 +1,5 @@
 package dark.core.common.blocks;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 

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

@@ -3,10 +3,6 @@ package dark.core.common.debug;
 import java.util.List;
 import java.util.Set;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -15,6 +11,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.common.DarkMain;
 import dark.core.prefab.BlockMachine;
 import dark.core.prefab.IExtraObjectInfo;
@@ -115,7 +113,7 @@ public class BlockDebug extends BlockMachine implements IExtraObjectInfo
     {
         for (int i = 0; i < debugBlocks.values().length; i++)
         {
-            list.add(new Pair<String,Class<? extends TileEntity>>("DMDebug" + i,debugBlocks.values()[i].clazz));
+            list.add(new Pair<String, Class<? extends TileEntity>>("DMDebug" + i, debugBlocks.values()[i].clazz));
         }
 
     }

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

@@ -2,7 +2,6 @@ package dark.core.common.debug;
 
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.compatibility.TileEntityUniversalElectrical;
-import universalelectricity.core.electricity.ElectricityPack;
 
 public class TileEntityInfLoad extends TileEntityUniversalElectrical
 {

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

@@ -4,7 +4,6 @@ import java.util.EnumSet;
 
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.compatibility.TileEntityUniversalElectrical;
-import universalelectricity.core.electricity.ElectricityPack;
 
 public class TileEntityInfSupply extends TileEntityUniversalElectrical
 {

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

@@ -11,12 +11,12 @@ 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
 {
     //TODO later add to this to make it actually have an ingame use other than debug
-    public static HashMap<FluidStack,Long> storage = new HashMap<FluidStack, Long>();
+    public static HashMap<FluidStack, Long> storage = new HashMap<FluidStack, Long>();
 
     FluidTank tank = new FluidTank(1000000);
 

src/dark/core/common/items/ItemColoredDust.java

@@ -11,12 +11,12 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.common.DarkMain;
 
-public class ItemColored extends Item
+public class ItemColoredDust extends Item
 {
+    @SideOnly(Side.CLIENT)
     private Icon theIcon;
 
-    @SideOnly(Side.CLIENT)
-    public ItemColored(int par1, String name)
+    public ItemColoredDust(int par1, String name)
     {
         super(par1);
         this.setMaxDamage(0);
@@ -39,11 +39,6 @@ public class ItemColored extends Item
         return true;
     }
 
-    /*
-     * @SideOnly(Side.CLIENT) public Icon getIconFromDamageForRenderPass(int par1, int par2) {
-     * return par2 > 0 ? this.theIcon : super.getIconFromDamageForRenderPass(par1, par2); }
-     */
-
     @SideOnly(Side.CLIENT)
     @Override
     public void registerIcons(IconRegister par1IconRegister)
@@ -53,9 +48,9 @@ public class ItemColored extends Item
     }
 
     @Override
-    public int getMetadata(int par1)
+    public int getMetadata(int meta)
     {
-        return par1;
+        return meta;
     }
 
     @Override

src/dark/core/common/items/ItemParts.java

@@ -2,14 +2,13 @@ package dark.core.common.items;
 
 import java.util.List;
 
-import dark.core.prefab.items.ItemBasic;
-
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.Configuration;
+import dark.core.prefab.items.ItemBasic;
 
 /** A metadata item containing parts of various machines in Liquid Mechanics Mod.
- *
+ * 
  * @author Rs */
 public class ItemParts extends ItemBasic
 {
@@ -34,7 +33,7 @@ public class ItemParts extends ItemBasic
 
     public ItemParts(int par1, Configuration config)
     {
-        super(par1,"DMParts",  config);
+        super(par1, "DMParts", config);
         this.setHasSubtypes(true);
         this.setMaxDamage(0);
         this.setMaxStackSize(64);

src/dark/core/common/items/ItemWrench.java

@@ -71,10 +71,10 @@ public class ItemWrench extends ItemBasic implements IToolWrench
     @Override
     public void wrenchUsed(EntityPlayer player, int x, int y, int z)
     {
-        if(damageWrench && player != null && !player.worldObj.isRemote)
+        if (damageWrench && player != null && !player.worldObj.isRemote)
         {
             ItemStack stack = player.getHeldItem();
-            if(stack != null && stack.itemID == this.itemID)
+            if (stack != null && stack.itemID == this.itemID)
             {
                 stack.damageItem(1, player);
             }

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

@@ -1,7 +1,6 @@
 package dark.core.common.transmit;
 
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import net.minecraft.block.Block;
@@ -247,8 +246,8 @@ public class BlockWire extends BlockMachine implements IExtraObjectInfo
     @Override
     public void loadExtraConfigs(Configuration config)
     {
-        this.wireResistance = config.get("Settings", "miliOhms", 1,"Resistance of the wire in 1/1000 of an ohm").getInt()/1000;
-        this.ampMax = config.get("Settings", "maxAmps", 10000,"Amp limit of the wire").getInt();
+        this.wireResistance = config.get("Settings", "miliOhms", 1, "Resistance of the wire in 1/1000 of an ohm").getInt() / 1000;
+        this.ampMax = config.get("Settings", "maxAmps", 10000, "Amp limit of the wire").getInt();
 
     }
 

src/dark/core/interfaces/ColorCode.java

@@ -32,7 +32,7 @@ public enum ColorCode
     }
 
     /** gets a ColorCode from any of the following
-     *
+     * 
      * @param obj - Integer,String,LiquidData,ColorCode
      * @return Color NONE if it can't find it */
     public static ColorCode get(Object obj)

src/dark/core/interfaces/IExternalInv.java

@@ -1,6 +1,5 @@
 package dark.core.interfaces;
 
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeDirection;
 

src/dark/core/interfaces/IInvBox.java

@@ -3,14 +3,13 @@ package dark.core.interfaces;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.ForgeDirection;
 
 /** External inventory management container for an object. Allows for most if not all inventory code
  * to be removed from the tile. That is some methods will still need to remain in order to work with
  * automation. As well this is not designed to replace the need for IInventory support of a tile but
  * to make it easier to manage. Suggested use it to create a prefab manager for several tiles. Then
  * have those tiles use the prefab as an extermal inventory manager to reduce code size per class.
- *
+ * 
  * @author DarkGuardsman */
 public interface IInvBox extends ISidedInventory
 {

src/dark/core/prefab/BlockColored.java

@@ -13,13 +13,17 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.common.DarkMain;
 
+/** Prefab class to make any block have 16 separate color instances similar to wool block
+ * 
+ * @author DarkGuardsman */
 public class BlockColored extends Block
 {
     @SideOnly(Side.CLIENT)
     private Icon[] icons;
+    @SideOnly(Side.CLIENT)
     private Icon singleIcon;
 
-    /* IS THIS BLOCK ABLE TO BE COLORED */
+    /** Use a single icon to create all 16 colors */
     boolean colorized = true;
 
     public BlockColored(String name, int id, Material par2Material)

src/dark/core/prefab/BlockMachine.java

@@ -16,7 +16,7 @@ import dark.core.common.DarkMain;
 /** 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 input config
  * file each time
- *
+ * 
  * @author Darkguardsman */
 public abstract class BlockMachine extends BlockTile implements ITileEntityProvider
 {

src/dark/core/prefab/IExtraObjectInfo.java

@@ -8,7 +8,7 @@ import dark.core.prefab.helpers.Pair;
 
 /** 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 IExtraObjectInfo
 {

src/dark/core/prefab/TileEntityInv.java

@@ -11,7 +11,7 @@ import dark.core.interfaces.IInvBox;
 import dark.core.prefab.invgui.InvChest;
 
 /** Prefab for simple object who only need basic inv support and nothing more
- *
+ * 
  * @author Darkguardsman */
 public class TileEntityInv extends TileEntityAdvanced implements IExternalInv, ISidedInventory
 {

src/dark/core/prefab/TileEntityMachine.java

@@ -32,7 +32,7 @@ import dark.core.prefab.invgui.InvChest;
 
 /** Prefab for most machines in the CoreMachine set. Provides basic power updates, packet updates,
  * inventory handling, and other handy methods.
- *
+ * 
  * @author DarkGuardsman */
 public abstract class TileEntityMachine extends TileEntityUniversalElectrical implements ISidedInventory, IExternalInv, IDisableable, IPacketReceiver, IPowerLess
 {
@@ -265,7 +265,7 @@ public abstract class TileEntityMachine extends TileEntityUniversalElectrical im
     }
 
     /** Handles reduced data from the main packet method
-     *
+     * 
      * @param id - packet ID
      * @param dis - data
      * @param player - player
@@ -346,7 +346,7 @@ public abstract class TileEntityMachine extends TileEntityUniversalElectrical im
         super.writeToNBT(nbt);
         nbt.setInteger("disabledTicks", this.ticksDisabled);
         nbt.setBoolean("shouldPower", this.unpowered);
-        nbt.setBoolean("isRunning",this.running);
+        nbt.setBoolean("isRunning", this.running);
     }
 
     /*--------------------------------------------------------------

src/dark/core/prefab/damage/IHpTile.java

@@ -5,12 +5,12 @@ import net.minecraft.util.DamageSource;
 
 /** Used by tiles that want to pretend to be living objects. Will require the use of this interface
  * as well spawning a EntityTileDamage entity as its location
- *
+ * 
  * @author DarkGuardsman */
 public interface IHpTile
 {
     /** Same as attackEntityFrom in Entity.class
-     *
+     * 
      * @param source - DamageSource/DamageType
      * @param ammount - amount of damage
      * @return */
@@ -24,7 +24,7 @@ public interface IHpTile
     public int hp();
 
     /** Sets the tiles hp
-     *
+     * 
      * @param i - amount
      * @param increase - increase instead of replace */
     public void setHp(int i, boolean increase);

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

@@ -20,7 +20,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 
 /** Rewrite of the imprinter crafting system into its own manageable class
- *
+ * 
  * @author DarkGuardsman */
 public class AutoCraftingManager
 {
@@ -57,7 +57,7 @@ public class AutoCraftingManager
     }
 
     /** Does this player's inventory contain the required resources to craft this item?
-     *
+     * 
      * @return Required items to make the desired item. */
     public Pair<ItemStack, ItemStack[]> getIdealRecipe(ItemStack outputItem)
     {
@@ -123,7 +123,7 @@ public class AutoCraftingManager
     }
 
     /** Gets the itemStacks in the inv based on slots
-     *
+     * 
      * @param inv - @IInventory instance
      * @param slots - slot # to be used
      * @return array of itemStack the same size as the slots input array */
@@ -143,7 +143,7 @@ public class AutoCraftingManager
     }
 
     /** Returns if the following inventory has the following resource required.
-     *
+     * 
      * @param recipeItems - The items to be checked for the recipes. */
     public ArrayList<ItemStack> hasResource(Object[] recipeItems)
     {
@@ -231,7 +231,7 @@ public class AutoCraftingManager
     }
 
     /** Decreases the stack by a set amount
-     *
+     * 
      * @param stack - starting stack
      * @param amount - amount of items
      * @return the edited stack */
@@ -262,7 +262,7 @@ public class AutoCraftingManager
     }
 
     /** Checks if an item exist within the inv array
-     *
+     * 
      * @param recipeItem - itemstack being searched for
      * @param containingItems - inv array containing the search bounds
      * @return the point in the array the item was found -1 = the item was null or not valid -2 =
@@ -294,14 +294,14 @@ public class AutoCraftingManager
 
     /** Checks if itemstack are equal based on crafting result rather than normal itemstack this is
      * done so that if the itemstack returns with
-     *
+     * 
      * @param recipeItem - itemstack being compared
      * @param checkStack - itemstack being comparted
      * @return true if the items are a match for each other
-     *
+     * 
      * If the item can't be stack and is able to take damage the item will be check on damaged
      * status
-     *
+     * 
      * If the item's meta data is not normal or in other words equals 32767 the meta data will be
      * ignored */
     public static boolean areStacksEqual(ItemStack recipeItem, ItemStack checkStack)
@@ -322,7 +322,7 @@ public class AutoCraftingManager
     }
 
     /** Consumes an item checking for extra conditions like container items
-     *
+     * 
      * @param stack - starting itemStack
      * @param ammount - amount to consume
      * @return what is left of the itemStack if any */
@@ -367,7 +367,7 @@ public class AutoCraftingManager
     }
 
     /** Used to automatically remove selected items from crafting inv
-     *
+     * 
      * @param requiredItems - items that are to be removed */
     public void consumeItems(ItemStack... requiredItems)
     {

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

@@ -6,11 +6,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
-import dark.core.interfaces.ColorCode;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFluid;
 import net.minecraft.tileentity.TileEntity;
@@ -20,13 +15,18 @@ import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidRegistry.FluidRegisterEvent;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidBlock;
 import net.minecraftforge.fluids.IFluidHandler;
-import net.minecraftforge.fluids.FluidRegistry.FluidRegisterEvent;
 import universalelectricity.core.vector.Vector3;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+
+import dark.core.interfaces.ColorCode;
+
 public class FluidHelper
 {
     public static List<Pair<Integer, Integer>> replacableBlockMeta = new ArrayList<Pair<Integer, Integer>>();
@@ -59,7 +59,7 @@ public class FluidHelper
     }
 
     /** Gets the block's fluid if it has one
-     *
+     * 
      * @param world - world we are working in
      * @param vector - 3D location in world
      * @return @Fluid that the block is */
@@ -96,10 +96,10 @@ public class FluidHelper
     }
 
     /** Drains a block of fluid
-     *
+     * 
      * @Note sets the block with a client update only. Doesn't tick the block allowing for better
      * placement of fluid that can flow infinitely
-     *
+     * 
      * @param doDrain - do the action
      * @return FluidStack drained from the block */
     public static FluidStack drainBlock(World world, Vector3 node, boolean doDrain)
@@ -108,7 +108,7 @@ public class FluidHelper
     }
 
     /** Drains a block of fluid
-     *
+     * 
      * @param doDrain - do the action
      * @param update - block update flag to use
      * @return FluidStack drained from the block */
@@ -207,9 +207,9 @@ public class FluidHelper
     }
 
     /** Helper method to fill a location with a fluid
-     *
+     * 
      * Note: This does not update the block to prevent the liquid from flowing
-     *
+     * 
      * @return */
     public static int fillBlock(World world, Vector3 node, FluidStack stack, boolean doFill)
     {
@@ -243,7 +243,7 @@ public class FluidHelper
     }
 
     /** Fills all instances of IFluidHandler surrounding the origin
-     *
+     * 
      * @param stack - FluidStack that will be filled into the tanks
      * @param doFill - Actually perform the action or simulate action
      * @param ignore - ForgeDirections to ignore
@@ -276,7 +276,7 @@ public class FluidHelper
     }
 
     /** Fills an instance of IFluidHandler in the given direction
-     *
+     * 
      * @param stack - FluidStack to fill the tank will
      * @param doFill - Actually perform the action or simulate action
      * @param direction - direction to fill in from the origin

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
@@ -69,7 +69,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 */
@@ -90,8 +90,9 @@ public class ItemWorldHelper
         }
         return newItemList;
     }
+
     /** 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/helpers/Quaternion.java

@@ -4,7 +4,7 @@ import universalelectricity.core.vector.Vector3;
 
 /** This code is converted from C code to java based off of this tutorial
  * http://content.gpwiki.org/index.php/OpenGL:Tutorials:Using_Quaternions_to_represent_rotation
- *
+ * 
  * @author DarkGuardsman */
 public class Quaternion
 {

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

@@ -6,7 +6,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.tileentity.TileEntity;
 
 /** Allows the use of a tile inv without the need for a container class
- *
+ * 
  * @author DarkGuardsman */
 public class ContainerFake extends Container
 {

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

@@ -134,7 +134,7 @@ public class InvChest implements IInvBox
     @Override
     public boolean isItemValidForSlot(int i, ItemStack itemstack)
     {
-        if(i >= this.getSizeInventory())
+        if (i >= this.getSizeInventory())
         {
             return false;
         }

src/dark/core/prefab/items/ItemBlockHolder.java

@@ -5,7 +5,7 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
 /** Simple itemBlock class for quick use with a block
- *
+ * 
  * @author Darkguardsman */
 public class ItemBlockHolder extends ItemBlock
 {

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

@@ -8,7 +8,7 @@ import dark.api.parts.INetworkPart;
 
 /** Used for tile networks that only need to share power or act like a group battery that doesn't
  * store power on world save
- *
+ * 
  * @author DarkGuardsman */
 public class NetworkSharedPower extends NetworkTileEntities implements IElectricalStorage, IPowerLess
 {

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

@@ -33,13 +33,13 @@ public abstract class NetworkTileEntities
 
     /** Creates a new instance of this network to be used to merge or split networks while still
      * maintaining each class that extends the base network class
-     *
+     * 
      * @return - new network instance using the current networks properties */
     public abstract NetworkTileEntities newInstance();
 
     /** Adds a TileEntity to the network. extends this to catch non-network parts and add them to
      * other tile lists
-     *
+     * 
      * @param tileEntity - tileEntity instance
      * @param member - add to network member list
      * @return */
@@ -149,7 +149,7 @@ public abstract class NetworkTileEntities
 
     /** Combines two networks together into one. Calls to preMerge and doMerge instead of doing the
      * merge process itself
-     *
+     * 
      * @param network
      * @param mergePoint */
     public void merge(NetworkTileEntities network, INetworkPart mergePoint)
@@ -165,17 +165,17 @@ public abstract class NetworkTileEntities
 
     /** Processing that needs too be done before the network merges. Use this to do final network
      * merge calculations and to cause network merge failure
-     *
+     * 
      * @param network the network that is to merge with this one
      * @param part the part at which started the network merge. Use this to cause damage if two
      * networks merge with real world style failures
-     *
+     * 
      * @return false if the merge needs to be canceled.
-     *
+     * 
      * Cases in which the network should fail to merge are were the two networks merge with error.
      * Or, in the case of pipes the two networks merge and the merge point was destroyed by
      * combination of liquids.
-     *
+     * 
      * Ex Lava and water */
     public boolean preMergeProcessing(NetworkTileEntities network, INetworkPart part)
     {
@@ -267,7 +267,7 @@ public abstract class NetworkTileEntities
     }
 
     /** invalidates/remove a tile from the networks that surround and connect to it
-     *
+     * 
      * @param tileEntity - tile */
     public static void invalidate(TileEntity tileEntity)
     {