From e2378f77b68889a86a4893649d15ea8d0d2690af Mon Sep 17 00:00:00 2001
From: pahimar <pahimar@gmail.com>
Date: Thu, 19 Dec 2013 18:41:22 -0500
Subject: [PATCH] Cleaning

---
 .../com/pahimar/ee3/EquivalentExchange3.java  |  1 -
 .../com/pahimar/ee3/addon/AddonHandler.java   |  2 +-
 .../ee3/addon/AddonIndustrialCraft2.java      |  4 +-
 .../ee3/{item => api}/EnergyStack.java        | 17 +--------
 .../pahimar/ee3/{item => api}/OreStack.java   | 28 +++++++-------
 .../com/pahimar/ee3/api/RecipeMapping.java    | 27 ++++++++-----
 .../pahimar/ee3/api/StackValueMapping.java    |  8 +++-
 .../ee3/{item => api}/WrappedStack.java       |  6 +--
 .../ee3/block/BlockAlchemicalChest.java       |  4 +-
 .../pahimar/ee3/block/BlockAludelBase.java    |  4 +-
 .../pahimar/ee3/block/BlockCalcinator.java    |  4 +-
 .../java/com/pahimar/ee3/block/BlockEE.java   |  1 -
 .../com/pahimar/ee3/block/BlockGlassBell.java |  7 ++--
 .../java/com/pahimar/ee3/block/ModBlocks.java |  5 +--
 .../ee3/client/audio/SoundHandler.java        |  1 -
 .../gui/inventory/GuiAlchemicalBag.java       |  1 -
 .../gui/inventory/GuiAlchemicalChest.java     |  1 -
 .../ee3/client/gui/inventory/GuiAludel.java   |  1 -
 .../client/gui/inventory/GuiCalcinator.java   |  1 -
 .../client/gui/inventory/GuiGlassBell.java    |  1 -
 .../gui/inventory/GuiPortableCrafting.java    |  7 +---
 .../inventory/GuiPortableTransmutation.java   |  1 -
 .../pahimar/ee3/client/model/ModelAludel.java |  1 -
 .../ee3/client/model/ModelCalcinator.java     |  1 -
 .../ee3/client/renderer/RenderUtils.java      |  2 -
 .../item/ItemAlchemicalChestRenderer.java     |  1 -
 .../renderer/item/ItemAludelRenderer.java     |  1 -
 .../renderer/item/ItemCalcinatorRenderer.java |  4 +-
 .../renderer/item/ItemGlassBellRenderer.java  |  4 +-
 .../TileEntityAlchemicalChestRenderer.java    |  1 -
 .../tileentity/TileEntityAludelRenderer.java  |  1 -
 .../TileEntityCalcinatorRenderer.java         |  1 -
 .../TileEntityGlassBellRenderer.java          |  1 -
 .../com/pahimar/ee3/command/CommandEE.java    | 15 ++++----
 .../pahimar/ee3/command/CommandHandler.java   |  1 -
 .../pahimar/ee3/command/CommandOverlay.java   | 13 +++----
 .../pahimar/ee3/command/CommandParticles.java |  1 -
 .../pahimar/ee3/command/CommandSounds.java    |  1 -
 .../pahimar/ee3/command/CommandVersion.java   |  2 -
 .../ee3/configuration/BlockConfiguration.java |  1 -
 .../configuration/ConfigurationHandler.java   |  2 -
 .../configuration/ConfigurationSettings.java  |  2 -
 .../ee3/configuration/ItemConfiguration.java  |  1 -
 .../TransmutationConfiguration.java           |  1 -
 .../ee3/creativetab/CreativeTabEE3.java       |  2 -
 .../java/com/pahimar/ee3/emc/EmcRegistry.java |  6 +--
 .../java/com/pahimar/ee3/emc/EmcValue.java    |  7 ++--
 .../com/pahimar/ee3/emc/EmcValuesDefault.java |  4 +-
 .../com/pahimar/ee3/emc/EmcValuesIMC.java     |  3 +-
 .../com/pahimar/ee3/event/ActionEvent.java    |  2 -
 .../pahimar/ee3/event/ActionRequestEvent.java |  2 -
 .../ee3/event/WorldTransmutationEvent.java    |  2 -
 .../ee3/handler/ActionRequestHandler.java     |  2 -
 .../pahimar/ee3/handler/CraftingHandler.java  | 12 +++---
 .../handler/DrawBlockHighlightHandler.java    |  2 -
 .../ee3/handler/EntityLivingHandler.java      |  2 -
 .../ee3/handler/EquivalencyHandler.java       | 25 ++----------
 .../pahimar/ee3/handler/ItemEventHandler.java |  1 -
 .../ee3/handler/ItemTooltipEventHandler.java  |  5 +--
 .../ee3/handler/KeyBindingHandler.java        |  1 -
 .../ee3/handler/PlayerDestroyItemHandler.java |  2 -
 .../TransmutationTargetOverlayHandler.java    |  2 -
 .../ee3/handler/VersionCheckTickHandler.java  |  2 -
 .../handler/WorldTransmutationHandler.java    |  2 -
 .../com/pahimar/ee3/helper/DebugHelper.java   | 10 +++--
 .../com/pahimar/ee3/helper/EmcHelper.java     |  2 +-
 .../com/pahimar/ee3/helper/FluidHelper.java   |  6 ++-
 .../com/pahimar/ee3/helper/GeneralHelper.java |  2 -
 .../com/pahimar/ee3/helper/ItemHelper.java    | 14 +++----
 .../ee3/helper/ItemStackNBTHelper.java        | 14 ++-----
 .../pahimar/ee3/helper/KeyBindingHelper.java  |  3 +-
 .../com/pahimar/ee3/helper/LogHelper.java     |  1 -
 .../com/pahimar/ee3/helper/QualityHelper.java |  2 -
 .../com/pahimar/ee3/helper/RecipeHelper.java  | 23 ++++++-----
 .../ee3/helper/TransmutationHelper.java       |  2 -
 .../com/pahimar/ee3/helper/VersionHelper.java |  6 +--
 .../pahimar/ee3/imc/InterModCommsHandler.java |  3 +-
 .../ee3/inventory/ContainerAlchemicalBag.java |  1 -
 .../inventory/ContainerAlchemicalChest.java   |  1 -
 .../ee3/inventory/ContainerAludel.java        |  1 -
 .../ee3/inventory/ContainerCalcinator.java    |  2 -
 .../ee3/inventory/ContainerGlassBell.java     |  1 -
 .../inventory/ContainerPortableCrafting.java  |  2 -
 .../ContainerPortableTransmutation.java       |  1 -
 .../pahimar/ee3/inventory/SlotCalcinator.java |  2 -
 .../com/pahimar/ee3/item/IChargeable.java     |  2 -
 .../java/com/pahimar/ee3/item/IKeyBound.java  |  2 -
 .../pahimar/ee3/item/ITransmutationStone.java |  2 -
 .../pahimar/ee3/item/ItemAlchemicalBag.java   |  3 +-
 .../pahimar/ee3/item/ItemAlchemicalChalk.java |  1 -
 .../pahimar/ee3/item/ItemAlchemicalDust.java  |  3 +-
 .../java/com/pahimar/ee3/item/ItemEE.java     |  1 -
 .../com/pahimar/ee3/item/ItemInertStone.java  |  1 -
 .../com/pahimar/ee3/item/ItemMiniumShard.java |  1 -
 .../com/pahimar/ee3/item/ItemMiniumStone.java |  3 --
 .../ee3/item/ItemPhilosophersStone.java       |  3 --
 .../java/com/pahimar/ee3/item/ModItems.java   |  5 +--
 .../ee3/item/crafting/RecipeRegistry.java     | 38 ++++++++++++-------
 .../crafting/RecipesAlchemicalBagDyes.java    |  2 -
 .../item/crafting/RecipesFluidContainers.java |  2 +-
 .../pahimar/ee3/item/crafting/RecipesIMC.java |  3 +-
 .../ee3/item/crafting/RecipesPotions.java     |  2 +-
 .../ee3/item/crafting/RecipesVanilla.java     |  2 +-
 .../java/com/pahimar/ee3/lib/ActionTypes.java |  2 -
 .../java/com/pahimar/ee3/lib/BlockIds.java    |  1 -
 .../java/com/pahimar/ee3/lib/Colours.java     |  1 -
 .../java/com/pahimar/ee3/lib/Compare.java     |  1 -
 src/main/java/com/pahimar/ee3/lib/GuiIds.java |  1 -
 .../java/com/pahimar/ee3/lib/ItemIds.java     |  1 -
 .../com/pahimar/ee3/lib/ItemUpdateTypes.java  |  2 -
 src/main/java/com/pahimar/ee3/lib/Models.java |  1 -
 .../java/com/pahimar/ee3/lib/Reference.java   |  1 -
 .../java/com/pahimar/ee3/lib/RenderIds.java   |  2 -
 src/main/java/com/pahimar/ee3/lib/Sounds.java |  1 -
 .../java/com/pahimar/ee3/lib/Textures.java    |  2 -
 .../pahimar/ee3/network/PacketHandler.java    | 15 ++++----
 .../ee3/network/PacketTypeHandler.java        |  1 -
 .../pahimar/ee3/network/packet/PacketEE.java  |  1 -
 .../ee3/network/packet/PacketItemUpdate.java  |  1 -
 .../ee3/network/packet/PacketKeyPressed.java  |  1 -
 .../network/packet/PacketRequestEvent.java    |  1 -
 .../ee3/network/packet/PacketSoundEvent.java  |  1 -
 .../network/packet/PacketSpawnParticle.java   |  4 --
 .../ee3/network/packet/PacketTileUpdate.java  |  2 -
 .../com/pahimar/ee3/proxy/ClientProxy.java    |  2 -
 .../com/pahimar/ee3/proxy/CommonProxy.java    |  2 -
 .../pahimar/ee3/recipe/RecipesCalcinator.java |  4 +-
 .../ee3/tileentity/TileAlchemicalChest.java   | 13 ++-----
 .../pahimar/ee3/tileentity/TileAludel.java    |  1 -
 .../ee3/tileentity/TileCalcinator.java        |  5 ---
 .../com/pahimar/ee3/tileentity/TileEE.java    |  2 -
 131 files changed, 175 insertions(+), 348 deletions(-)
 rename src/main/java/com/pahimar/ee3/{item => api}/EnergyStack.java (92%)
 rename src/main/java/com/pahimar/ee3/{item => api}/OreStack.java (87%)
 rename src/main/java/com/pahimar/ee3/{item => api}/WrappedStack.java (99%)

diff --git a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
index c1d87d15..da3258f3 100644
--- a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
+++ b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java
@@ -40,7 +40,6 @@ import java.io.File;
  * EquivalentExchange3
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, dependencies = Reference.DEPENDENCIES, certificateFingerprint = Reference.FINGERPRINT)
 @NetworkMod(channels = {Reference.CHANNEL_NAME}, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
diff --git a/src/main/java/com/pahimar/ee3/addon/AddonHandler.java b/src/main/java/com/pahimar/ee3/addon/AddonHandler.java
index 67aa3764..90429430 100644
--- a/src/main/java/com/pahimar/ee3/addon/AddonHandler.java
+++ b/src/main/java/com/pahimar/ee3/addon/AddonHandler.java
@@ -25,7 +25,7 @@ public class AddonHandler
         AddonIndustrialCraft2.init();
     }
 
-    public static void sendAddRecipe(Object outputObject, Object ... inputObjects)
+    public static void sendAddRecipe(Object outputObject, Object... inputObjects)
     {
         List<?> inputObjectsList = Arrays.asList(inputObjects);
         FMLInterModComms.sendMessage(Reference.MOD_ID, InterModCommsOperations.RECIPE_ADD, new RecipeMapping(outputObject, inputObjectsList).toJson());
diff --git a/src/main/java/com/pahimar/ee3/addon/AddonIndustrialCraft2.java b/src/main/java/com/pahimar/ee3/addon/AddonIndustrialCraft2.java
index 18d29049..7fca0de5 100644
--- a/src/main/java/com/pahimar/ee3/addon/AddonIndustrialCraft2.java
+++ b/src/main/java/com/pahimar/ee3/addon/AddonIndustrialCraft2.java
@@ -1,8 +1,8 @@
 package com.pahimar.ee3.addon;
 
+import com.pahimar.ee3.api.OreStack;
+import com.pahimar.ee3.api.WrappedStack;
 import com.pahimar.ee3.emc.EmcValue;
-import com.pahimar.ee3.item.OreStack;
-import com.pahimar.ee3.item.WrappedStack;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/pahimar/ee3/item/EnergyStack.java b/src/main/java/com/pahimar/ee3/api/EnergyStack.java
similarity index 92%
rename from src/main/java/com/pahimar/ee3/item/EnergyStack.java
rename to src/main/java/com/pahimar/ee3/api/EnergyStack.java
index 8c248fc8..a476d561 100644
--- a/src/main/java/com/pahimar/ee3/item/EnergyStack.java
+++ b/src/main/java/com/pahimar/ee3/api/EnergyStack.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.item;
+package com.pahimar.ee3.api;
 
 import com.pahimar.ee3.lib.Compare;
 
@@ -15,14 +15,12 @@ public class EnergyStack implements Comparable<EnergyStack>
 
     public EnergyStack(String energyName, int stackSize)
     {
-
         this.energyName = energyName;
         this.stackSize = stackSize;
     }
 
     public EnergyStack(String energyName)
     {
-
         this(energyName, 1);
     }
 
@@ -35,18 +33,11 @@ public class EnergyStack implements Comparable<EnergyStack>
     @Override
     public boolean equals(Object object)
     {
-
-        if (!(object instanceof EnergyStack))
-        {
-            return false;
-        }
-
-        return (this.compareTo((EnergyStack) object) == Compare.EQUALS);
+        return object instanceof EnergyStack && (this.compareTo((EnergyStack) object) == Compare.EQUALS);
     }
 
     public static boolean compareEnergyNames(EnergyStack energyStack1, EnergyStack energyStack2)
     {
-
         if (energyStack1 != null && energyStack2 != null)
         {
             if ((energyStack1.energyName != null) && (energyStack2.energyName != null))
@@ -61,7 +52,6 @@ public class EnergyStack implements Comparable<EnergyStack>
     @Override
     public int compareTo(EnergyStack energyStack)
     {
-
         return comparator.compare(this, energyStack);
     }
 
@@ -72,11 +62,9 @@ public class EnergyStack implements Comparable<EnergyStack>
 
     public static Comparator<EnergyStack> comparator = new Comparator<EnergyStack>()
     {
-
         @Override
         public int compare(EnergyStack energyStack1, EnergyStack energyStack2)
         {
-
             if (energyStack1 != null)
             {
                 if (energyStack2 != null)
@@ -107,6 +95,5 @@ public class EnergyStack implements Comparable<EnergyStack>
                 }
             }
         }
-
     };
 }
diff --git a/src/main/java/com/pahimar/ee3/item/OreStack.java b/src/main/java/com/pahimar/ee3/api/OreStack.java
similarity index 87%
rename from src/main/java/com/pahimar/ee3/item/OreStack.java
rename to src/main/java/com/pahimar/ee3/api/OreStack.java
index 0ff13729..4f0cfb7a 100644
--- a/src/main/java/com/pahimar/ee3/item/OreStack.java
+++ b/src/main/java/com/pahimar/ee3/api/OreStack.java
@@ -1,7 +1,9 @@
-package com.pahimar.ee3.item;
+package com.pahimar.ee3.api;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
 import com.google.gson.JsonSyntaxException;
+import com.pahimar.ee3.helper.LogHelper;
 import com.pahimar.ee3.lib.Compare;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
@@ -44,12 +46,7 @@ public class OreStack implements Comparable<OreStack>
     @Override
     public boolean equals(Object object)
     {
-        if (!(object instanceof OreStack))
-        {
-            return false;
-        }
-
-        return (comparator.compare(this, (OreStack) object) == Compare.EQUALS);
+        return object instanceof OreStack && (comparator.compare(this, (OreStack) object) == Compare.EQUALS);
     }
 
     public static boolean compareOreNames(OreStack oreStack1, OreStack oreStack2)
@@ -72,12 +69,12 @@ public class OreStack implements Comparable<OreStack>
     }
 
     /**
-     * Deserializes a OreStack object from the given serialized json
-     * String
+     * Deserializes a OreStack object from the given serialized json String
      *
-     * @param jsonOreStack Json encoded String representing a OreStack object
-     * @return The OreStack that was encoded as json, or null if a valid
-     * OreStack could not be decoded from given String
+     * @param jsonOreStack
+     *         Json encoded String representing a OreStack object
+     *
+     * @return The OreStack that was encoded as json, or null if a valid OreStack could not be decoded from given String
      */
     public static OreStack createFromJson(String jsonOreStack)
     {
@@ -87,7 +84,11 @@ public class OreStack implements Comparable<OreStack>
         }
         catch (JsonSyntaxException exception)
         {
-            // TODO Log something regarding the failed parse
+            LogHelper.severe(exception.getMessage());
+        }
+        catch (JsonParseException exception)
+        {
+            LogHelper.severe(exception.getMessage());
         }
 
         return null;
@@ -163,6 +164,5 @@ public class OreStack implements Comparable<OreStack>
                 }
             }
         }
-
     };
 }
diff --git a/src/main/java/com/pahimar/ee3/api/RecipeMapping.java b/src/main/java/com/pahimar/ee3/api/RecipeMapping.java
index 369a6f8d..f51f5f33 100644
--- a/src/main/java/com/pahimar/ee3/api/RecipeMapping.java
+++ b/src/main/java/com/pahimar/ee3/api/RecipeMapping.java
@@ -1,7 +1,7 @@
 package com.pahimar.ee3.api;
 
 import com.google.gson.*;
-import com.pahimar.ee3.item.WrappedStack;
+import com.pahimar.ee3.helper.LogHelper;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -54,8 +54,11 @@ public class RecipeMapping implements JsonSerializer<RecipeMapping>, JsonDeseria
         }
         catch (JsonSyntaxException exception)
         {
-            exception.printStackTrace();
-            // TODO Log something regarding the failed parse
+            LogHelper.severe(exception.getMessage());
+        }
+        catch (JsonParseException exception)
+        {
+            LogHelper.severe(exception.getMessage());
         }
 
         return null;
@@ -67,23 +70,28 @@ public class RecipeMapping implements JsonSerializer<RecipeMapping>, JsonDeseria
     }
 
     @Override
-    public RecipeMapping deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext context) throws JsonParseException {
+    public RecipeMapping deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext context) throws JsonParseException
+    {
 
-        if (!jsonElement.isJsonPrimitive()) {
+        if (!jsonElement.isJsonPrimitive())
+        {
 
             JsonObject jsonRecipeMapping = (JsonObject) jsonElement;
 
             WrappedStack outputStack = null;
             List<WrappedStack> inputStacks = new ArrayList<WrappedStack>();
 
-            if (jsonRecipeMapping.get("outputWrappedStack") != null) {
+            if (jsonRecipeMapping.get("outputWrappedStack") != null)
+            {
                 outputStack = new WrappedStack().deserialize(jsonRecipeMapping.get("outputWrappedStack").getAsJsonObject(), type, context);
             }
 
-            if (jsonRecipeMapping.get("inputWrappedStacks") != null) {
+            if (jsonRecipeMapping.get("inputWrappedStacks") != null)
+            {
                 JsonArray jsonInputStacks = jsonRecipeMapping.get("inputWrappedStacks").getAsJsonArray();
 
-                for (int i = 0; i < jsonInputStacks.size(); i++) {
+                for (int i = 0; i < jsonInputStacks.size(); i++)
+                {
                     WrappedStack inputStack = new WrappedStack().deserialize(jsonInputStacks.get(i).getAsJsonObject(), type, context);
                     inputStacks.add(inputStack);
                 }
@@ -96,7 +104,8 @@ public class RecipeMapping implements JsonSerializer<RecipeMapping>, JsonDeseria
     }
 
     @Override
-    public JsonElement serialize(RecipeMapping recipeMapping, Type type, JsonSerializationContext context) {
+    public JsonElement serialize(RecipeMapping recipeMapping, Type type, JsonSerializationContext context)
+    {
 
         JsonObject jsonRecipeMapping = new JsonObject();
 
diff --git a/src/main/java/com/pahimar/ee3/api/StackValueMapping.java b/src/main/java/com/pahimar/ee3/api/StackValueMapping.java
index f2416438..3a2b17f2 100644
--- a/src/main/java/com/pahimar/ee3/api/StackValueMapping.java
+++ b/src/main/java/com/pahimar/ee3/api/StackValueMapping.java
@@ -2,7 +2,7 @@ package com.pahimar.ee3.api;
 
 import com.google.gson.*;
 import com.pahimar.ee3.emc.EmcValue;
-import com.pahimar.ee3.item.WrappedStack;
+import com.pahimar.ee3.helper.LogHelper;
 
 import java.lang.reflect.Type;
 
@@ -35,7 +35,11 @@ public class StackValueMapping implements JsonSerializer<StackValueMapping>, Jso
         }
         catch (JsonSyntaxException exception)
         {
-            // TODO Log something regarding the failed parse
+            LogHelper.severe(exception.getMessage());
+        }
+        catch (JsonParseException exception)
+        {
+            LogHelper.severe(exception.getMessage());
         }
 
         return null;
diff --git a/src/main/java/com/pahimar/ee3/item/WrappedStack.java b/src/main/java/com/pahimar/ee3/api/WrappedStack.java
similarity index 99%
rename from src/main/java/com/pahimar/ee3/item/WrappedStack.java
rename to src/main/java/com/pahimar/ee3/api/WrappedStack.java
index 619c2c59..564443c7 100644
--- a/src/main/java/com/pahimar/ee3/item/WrappedStack.java
+++ b/src/main/java/com/pahimar/ee3/api/WrappedStack.java
@@ -1,4 +1,4 @@
-package com.pahimar.ee3.item;
+package com.pahimar.ee3.api;
 
 import com.google.gson.*;
 import com.pahimar.ee3.helper.FluidHelper;
@@ -290,11 +290,11 @@ public class WrappedStack
         }
         catch (JsonSyntaxException exception)
         {
-            LogHelper.warning(exception.getMessage());
+            LogHelper.severe(exception.getMessage());
         }
         catch (JsonParseException exception)
         {
-            LogHelper.warning(exception.getMessage());
+            LogHelper.severe(exception.getMessage());
         }
 
         return null;
diff --git a/src/main/java/com/pahimar/ee3/block/BlockAlchemicalChest.java b/src/main/java/com/pahimar/ee3/block/BlockAlchemicalChest.java
index c43fc87b..3cf7a1af 100644
--- a/src/main/java/com/pahimar/ee3/block/BlockAlchemicalChest.java
+++ b/src/main/java/com/pahimar/ee3/block/BlockAlchemicalChest.java
@@ -23,14 +23,12 @@ import java.util.Random;
  * BlockAlchemicalChest
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class BlockAlchemicalChest extends BlockEE
 {
 
     /**
-     * Is the random generator used by alchemical chest to drop the inventory
-     * contents in random directions.
+     * Is the random generator used by alchemical chest to drop the inventory contents in random directions.
      */
     private Random rand = new Random();
 
diff --git a/src/main/java/com/pahimar/ee3/block/BlockAludelBase.java b/src/main/java/com/pahimar/ee3/block/BlockAludelBase.java
index 682e84d7..b01d90be 100644
--- a/src/main/java/com/pahimar/ee3/block/BlockAludelBase.java
+++ b/src/main/java/com/pahimar/ee3/block/BlockAludelBase.java
@@ -26,14 +26,12 @@ import java.util.Random;
  * BlockAludel
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class BlockAludelBase extends BlockEE
 {
 
     /**
-     * Is the random generator used by aludel to drop the inventory contents in
-     * random directions.
+     * Is the random generator used by aludel to drop the inventory contents in random directions.
      */
     private Random rand = new Random();
 
diff --git a/src/main/java/com/pahimar/ee3/block/BlockCalcinator.java b/src/main/java/com/pahimar/ee3/block/BlockCalcinator.java
index beac47ad..14490a41 100644
--- a/src/main/java/com/pahimar/ee3/block/BlockCalcinator.java
+++ b/src/main/java/com/pahimar/ee3/block/BlockCalcinator.java
@@ -22,14 +22,12 @@ import java.util.Random;
  * BlockCalcinator
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class BlockCalcinator extends BlockEE
 {
 
     /**
-     * Is the random generator used by calcinator to drop the inventory contents
-     * in random directions.
+     * Is the random generator used by calcinator to drop the inventory contents in random directions.
      */
     private Random rand = new Random();
 
diff --git a/src/main/java/com/pahimar/ee3/block/BlockEE.java b/src/main/java/com/pahimar/ee3/block/BlockEE.java
index cf340d1c..613ec743 100644
--- a/src/main/java/com/pahimar/ee3/block/BlockEE.java
+++ b/src/main/java/com/pahimar/ee3/block/BlockEE.java
@@ -19,7 +19,6 @@ import net.minecraftforge.common.ForgeDirection;
  * BlockEE
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public abstract class BlockEE extends BlockContainer
 {
diff --git a/src/main/java/com/pahimar/ee3/block/BlockGlassBell.java b/src/main/java/com/pahimar/ee3/block/BlockGlassBell.java
index 4b34f541..7071b40b 100644
--- a/src/main/java/com/pahimar/ee3/block/BlockGlassBell.java
+++ b/src/main/java/com/pahimar/ee3/block/BlockGlassBell.java
@@ -28,8 +28,7 @@ public class BlockGlassBell extends BlockEE
 {
 
     /**
-     * Is the random generator used by glass bell to drop the inventory contents
-     * in random directions.
+     * Is the random generator used by glass bell to drop the inventory contents in random directions.
      */
     private Random rand = new Random();
 
@@ -144,8 +143,8 @@ public class BlockGlassBell extends BlockEE
     }
 
     /**
-     * Ray traces through the blocks collision from start vector to end vector
-     * returning a ray trace hit. Args: world, x, y, z, startVec, endVec
+     * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world,
+     * x, y, z, startVec, endVec
      */
     @Override
     public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 startVec, Vec3 endVec)
diff --git a/src/main/java/com/pahimar/ee3/block/ModBlocks.java b/src/main/java/com/pahimar/ee3/block/ModBlocks.java
index 565bab40..cc103972 100644
--- a/src/main/java/com/pahimar/ee3/block/ModBlocks.java
+++ b/src/main/java/com/pahimar/ee3/block/ModBlocks.java
@@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
  * ModBlocks
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ModBlocks
 {
@@ -43,7 +42,7 @@ public class ModBlocks
     private static void initBlockRecipes()
     {
 
-        GameRegistry.addRecipe(new ItemStack(glassBell), new Object[] {"iii", "i i", "i i", 'i', Block.glass});
-        GameRegistry.addRecipe(new ItemStack(aludelBase), new Object[] {"iii", "sis", "iii", 'i', Item.ingotIron, 's', Block.stone});
+        GameRegistry.addRecipe(new ItemStack(glassBell), new Object[]{"iii", "i i", "i i", 'i', Block.glass});
+        GameRegistry.addRecipe(new ItemStack(aludelBase), new Object[]{"iii", "sis", "iii", 'i', Item.ingotIron, 's', Block.stone});
     }
 }
diff --git a/src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java b/src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java
index 3ea647c7..401ff20c 100644
--- a/src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java
+++ b/src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java
@@ -11,7 +11,6 @@ import net.minecraftforge.event.ForgeSubscribe;
  * SoundHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class SoundHandler
 {
diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java
index 49abe667..937af325 100644
--- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java
+++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java
@@ -18,7 +18,6 @@ import org.lwjgl.opengl.GL11;
  * GuiAlchemicalBag
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class GuiAlchemicalBag extends GuiContainer
diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java
index bdcc6b85..1d51337b 100644
--- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java
+++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java
@@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
  * GuiAlchemicalChest
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class GuiAlchemicalChest extends GuiContainer
diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java
index 2d18d2e6..e46f87d3 100644
--- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java
+++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java
@@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
  * GuiAludel
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class GuiAludel extends GuiContainer
diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java
index 578e4de2..29af50de 100644
--- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java
+++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java
@@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
  * GuiCalcinator
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class GuiCalcinator extends GuiContainer
diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java
index 97c0e51f..0ef76e00 100644
--- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java
+++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java
@@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
  * GuiGlassBell
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class GuiGlassBell extends GuiContainer
diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java
index 8a2cbe51..2c0036fc 100644
--- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java
+++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java
@@ -19,7 +19,6 @@ import org.lwjgl.opengl.GL11;
  * GuiPortableCrafting
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class GuiPortableCrafting extends GuiContainer
@@ -32,8 +31,7 @@ public class GuiPortableCrafting extends GuiContainer
     }
 
     /**
-     * Draw the foreground layer for the GuiContainer (everything in front of
-     * the items)
+     * Draw the foreground layer for the GuiContainer (everything in front of the items)
      */
     @Override
     protected void drawGuiContainerForegroundLayer(int par1, int par2)
@@ -44,8 +42,7 @@ public class GuiPortableCrafting extends GuiContainer
     }
 
     /**
-     * Draw the background layer for the GuiContainer (everything behind the
-     * items)
+     * Draw the background layer for the GuiContainer (everything behind the items)
      */
     @Override
     protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java
index d09d6391..c4f7a1c3 100644
--- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java
+++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java
@@ -16,7 +16,6 @@ import org.lwjgl.opengl.GL11;
  * GuiPortableTransmutation
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class GuiPortableTransmutation extends GuiContainer
diff --git a/src/main/java/com/pahimar/ee3/client/model/ModelAludel.java b/src/main/java/com/pahimar/ee3/client/model/ModelAludel.java
index 4bf76339..01b02b3e 100644
--- a/src/main/java/com/pahimar/ee3/client/model/ModelAludel.java
+++ b/src/main/java/com/pahimar/ee3/client/model/ModelAludel.java
@@ -12,7 +12,6 @@ import net.minecraftforge.client.model.IModelCustom;
  * ModelAludel
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class ModelAludel
diff --git a/src/main/java/com/pahimar/ee3/client/model/ModelCalcinator.java b/src/main/java/com/pahimar/ee3/client/model/ModelCalcinator.java
index 74cd68e7..880ab0e2 100644
--- a/src/main/java/com/pahimar/ee3/client/model/ModelCalcinator.java
+++ b/src/main/java/com/pahimar/ee3/client/model/ModelCalcinator.java
@@ -12,7 +12,6 @@ import net.minecraftforge.client.model.IModelCustom;
  * Model for the Calcinator
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class ModelCalcinator
diff --git a/src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java b/src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java
index cc188d41..9719fab2 100644
--- a/src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java
+++ b/src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java
@@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11;
  * RenderUtils
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class RenderUtils
 {
@@ -67,7 +66,6 @@ public class RenderUtils
         GL11.glColor4f(red, green, blue, opacity);
         drawTexturedQuad(x, y, icon, 16 * scale, 16 * scale, -90);
         GL11.glEnable(GL11.GL_LIGHTING);
-
     }
 
     public static void drawTexturedQuad(int x, int y, Icon icon, float width, float height, double zLevel)
diff --git a/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java
index cbd680e1..52c11f63 100644
--- a/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java
+++ b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java
@@ -15,7 +15,6 @@ import org.lwjgl.opengl.GL11;
  * ItemAlchemicalChestRenderer
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class ItemAlchemicalChestRenderer implements IItemRenderer
diff --git a/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java
index 3a3830c7..36b4a7ed 100644
--- a/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java
+++ b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java
@@ -15,7 +15,6 @@ import org.lwjgl.opengl.GL11;
  * ItemAludelRenderer
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class ItemAludelRenderer implements IItemRenderer
diff --git a/src/main/java/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java
index 72568fd9..91f78be8 100644
--- a/src/main/java/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java
+++ b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java
@@ -15,7 +15,6 @@ import org.lwjgl.opengl.GL11;
  * ItemCalcinatorRenderer
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class ItemCalcinatorRenderer implements IItemRenderer
@@ -70,7 +69,8 @@ public class ItemCalcinatorRenderer implements IItemRenderer
                 return;
             }
             default:
-                return;
+            {
+            }
         }
     }
 
diff --git a/src/main/java/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java
index 6a02425a..81748005 100644
--- a/src/main/java/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java
+++ b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java
@@ -15,7 +15,6 @@ import org.lwjgl.opengl.GL11;
  * ItemGlassBellRenderer
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class ItemGlassBellRenderer implements IItemRenderer
@@ -70,7 +69,8 @@ public class ItemGlassBellRenderer implements IItemRenderer
                 return;
             }
             default:
-                return;
+            {
+            }
         }
     }
 
diff --git a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java
index ccde6018..1c80db2b 100644
--- a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java
+++ b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java
@@ -18,7 +18,6 @@ import org.lwjgl.opengl.GL12;
  * TileEntityAlchemicalChestRenderer
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class TileEntityAlchemicalChestRenderer extends
diff --git a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java
index 889d1758..62ce336b 100644
--- a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java
+++ b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java
@@ -23,7 +23,6 @@ import org.lwjgl.opengl.GL11;
  * TileEntityAludelRenderer
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class TileEntityAludelRenderer extends TileEntitySpecialRenderer
diff --git a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java
index ff769fd5..68d07a27 100644
--- a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java
+++ b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java
@@ -16,7 +16,6 @@ import org.lwjgl.opengl.GL11;
  * TileEntityCalcinatorRenderer
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer
diff --git a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java
index a577f922..cae5e2b6 100644
--- a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java
+++ b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java
@@ -22,7 +22,6 @@ import org.lwjgl.opengl.GL11;
  * TileEntityGlassBellRenderer
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class TileEntityGlassBellRenderer extends TileEntitySpecialRenderer
diff --git a/src/main/java/com/pahimar/ee3/command/CommandEE.java b/src/main/java/com/pahimar/ee3/command/CommandEE.java
index 8e688973..aa6b24d8 100644
--- a/src/main/java/com/pahimar/ee3/command/CommandEE.java
+++ b/src/main/java/com/pahimar/ee3/command/CommandEE.java
@@ -14,7 +14,6 @@ import java.util.List;
  * CommandEE
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class CommandEE extends CommandBase
 {
@@ -42,25 +41,25 @@ public class CommandEE extends CommandBase
         {
             case 1:
             {
-                return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_OVERLAY, Commands.COMMAND_PARTICLES, Commands.COMMAND_SOUNDS, Commands.COMMAND_VERSION});
+                return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_OVERLAY, Commands.COMMAND_PARTICLES, Commands.COMMAND_SOUNDS, Commands.COMMAND_VERSION});
             }
             case 2:
             {
                 if (args[0].equalsIgnoreCase(Commands.COMMAND_OVERLAY))
                 {
-                    return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_ON, Commands.COMMAND_OFF, Commands.COMMAND_POSITION, Commands.COMMAND_SCALE, Commands.COMMAND_OPACITY});
+                    return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_ON, Commands.COMMAND_OFF, Commands.COMMAND_POSITION, Commands.COMMAND_SCALE, Commands.COMMAND_OPACITY});
                 }
                 else if (args[0].equalsIgnoreCase(Commands.COMMAND_PARTICLES))
                 {
-                    return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_ON, Commands.COMMAND_OFF});
+                    return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_ON, Commands.COMMAND_OFF});
                 }
                 else if (args[0].equalsIgnoreCase(Commands.COMMAND_SOUNDS))
                 {
-                    return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_ALL, Commands.COMMAND_SELF, Commands.COMMAND_OFF});
+                    return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_ALL, Commands.COMMAND_SELF, Commands.COMMAND_OFF});
                 }
                 else if (args[0].equalsIgnoreCase(Commands.COMMAND_VERSION))
                 {
-                    return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_CHANGELOG});
+                    return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_CHANGELOG});
                 }
             }
             case 3:
@@ -69,7 +68,7 @@ public class CommandEE extends CommandBase
                 {
                     if (args[1].equalsIgnoreCase(Commands.COMMAND_POSITION))
                     {
-                        return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_TOP, Commands.COMMAND_BOTTOM});
+                        return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_TOP, Commands.COMMAND_BOTTOM});
                     }
                 }
             }
@@ -81,7 +80,7 @@ public class CommandEE extends CommandBase
                     {
                         if (args[2].equalsIgnoreCase(Commands.COMMAND_TOP) || args[2].equalsIgnoreCase(Commands.COMMAND_BOTTOM))
                         {
-                            return getListOfStringsMatchingLastWord(args, new String[] {Commands.COMMAND_LEFT, Commands.COMMAND_RIGHT});
+                            return getListOfStringsMatchingLastWord(args, new String[]{Commands.COMMAND_LEFT, Commands.COMMAND_RIGHT});
                         }
                     }
                 }
diff --git a/src/main/java/com/pahimar/ee3/command/CommandHandler.java b/src/main/java/com/pahimar/ee3/command/CommandHandler.java
index 92383589..8ef7568e 100644
--- a/src/main/java/com/pahimar/ee3/command/CommandHandler.java
+++ b/src/main/java/com/pahimar/ee3/command/CommandHandler.java
@@ -8,7 +8,6 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
  * CommandHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class CommandHandler
 {
diff --git a/src/main/java/com/pahimar/ee3/command/CommandOverlay.java b/src/main/java/com/pahimar/ee3/command/CommandOverlay.java
index 4cb022f9..6f1c0acd 100644
--- a/src/main/java/com/pahimar/ee3/command/CommandOverlay.java
+++ b/src/main/java/com/pahimar/ee3/command/CommandOverlay.java
@@ -14,7 +14,6 @@ import net.minecraft.util.ChatMessageComponent;
  * CommandOverlay
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class CommandOverlay
 {
@@ -84,7 +83,7 @@ public class CommandOverlay
 
                 if (scale <= 0F)
                 {
-                    throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_SCALE_USAGE});
+                    throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_SCALE_USAGE});
                 }
                 else
                 {
@@ -95,12 +94,12 @@ public class CommandOverlay
             }
             catch (Exception e)
             {
-                throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_SCALE_USAGE});
+                throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_SCALE_USAGE});
             }
         }
         else
         {
-            throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_SCALE_USAGE});
+            throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_SCALE_USAGE});
         }
     }
 
@@ -115,7 +114,7 @@ public class CommandOverlay
 
                 if (opacity < 0F || opacity > 1F)
                 {
-                    throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_OPACITY_USAGE});
+                    throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_OPACITY_USAGE});
                 }
                 else
                 {
@@ -126,12 +125,12 @@ public class CommandOverlay
             }
             catch (Exception e)
             {
-                throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_OPACITY_USAGE});
+                throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_OPACITY_USAGE});
             }
         }
         else
         {
-            throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[] {Commands.COMMAND_OVERLAY_OPACITY_USAGE});
+            throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT, new Object[]{Commands.COMMAND_OVERLAY_OPACITY_USAGE});
         }
     }
 
diff --git a/src/main/java/com/pahimar/ee3/command/CommandParticles.java b/src/main/java/com/pahimar/ee3/command/CommandParticles.java
index 6f96f1cd..ea2fdaf6 100644
--- a/src/main/java/com/pahimar/ee3/command/CommandParticles.java
+++ b/src/main/java/com/pahimar/ee3/command/CommandParticles.java
@@ -14,7 +14,6 @@ import net.minecraft.util.ChatMessageComponent;
  * CommandParticles
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class CommandParticles
 {
diff --git a/src/main/java/com/pahimar/ee3/command/CommandSounds.java b/src/main/java/com/pahimar/ee3/command/CommandSounds.java
index 5e6278f8..ecc6d8df 100644
--- a/src/main/java/com/pahimar/ee3/command/CommandSounds.java
+++ b/src/main/java/com/pahimar/ee3/command/CommandSounds.java
@@ -13,7 +13,6 @@ import net.minecraft.util.ChatMessageComponent;
  * CommandSounds
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class CommandSounds
 {
diff --git a/src/main/java/com/pahimar/ee3/command/CommandVersion.java b/src/main/java/com/pahimar/ee3/command/CommandVersion.java
index 460e5ea1..4e96b7cf 100644
--- a/src/main/java/com/pahimar/ee3/command/CommandVersion.java
+++ b/src/main/java/com/pahimar/ee3/command/CommandVersion.java
@@ -12,7 +12,6 @@ import net.minecraft.util.ChatMessageComponent;
  * CommandVersion
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class CommandVersion
 {
@@ -55,5 +54,4 @@ public class CommandVersion
     {
 
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/configuration/BlockConfiguration.java b/src/main/java/com/pahimar/ee3/configuration/BlockConfiguration.java
index 9666affb..955fb189 100644
--- a/src/main/java/com/pahimar/ee3/configuration/BlockConfiguration.java
+++ b/src/main/java/com/pahimar/ee3/configuration/BlockConfiguration.java
@@ -36,5 +36,4 @@ public class BlockConfiguration
             blockConfiguration.save();
         }
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/configuration/ConfigurationHandler.java b/src/main/java/com/pahimar/ee3/configuration/ConfigurationHandler.java
index c85c5aa1..737fbbf4 100644
--- a/src/main/java/com/pahimar/ee3/configuration/ConfigurationHandler.java
+++ b/src/main/java/com/pahimar/ee3/configuration/ConfigurationHandler.java
@@ -10,7 +10,6 @@ import java.io.File;
  * ConfigurationHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ConfigurationHandler
 {
@@ -27,5 +26,4 @@ public class ConfigurationHandler
         ItemConfiguration.init(new File(configPath + "item.properties"));
         TransmutationConfiguration.init(new File(configPath + "transmutation.properties"));
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java b/src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java
index 50901bc0..8615ab70 100644
--- a/src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java
+++ b/src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java
@@ -8,7 +8,6 @@ import com.pahimar.ee3.lib.Strings;
  * ConfigurationSettings
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ConfigurationSettings
 {
@@ -113,5 +112,4 @@ public class ConfigurationSettings
     public static int TRANSMUTE_COST_MOB;
     public static final String TRANSMUTE_COST_MOB_CONFIGNAME = Strings.TRANSMUTATION_COST_MOB;
     public static final int TRANSMUTE_COST_MOB_DEFAULT = 1;
-
 }
diff --git a/src/main/java/com/pahimar/ee3/configuration/ItemConfiguration.java b/src/main/java/com/pahimar/ee3/configuration/ItemConfiguration.java
index d5facc98..19883af9 100644
--- a/src/main/java/com/pahimar/ee3/configuration/ItemConfiguration.java
+++ b/src/main/java/com/pahimar/ee3/configuration/ItemConfiguration.java
@@ -47,5 +47,4 @@ public class ItemConfiguration
             itemConfiguration.save();
         }
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/configuration/TransmutationConfiguration.java b/src/main/java/com/pahimar/ee3/configuration/TransmutationConfiguration.java
index 60ffcc38..ce4def2b 100644
--- a/src/main/java/com/pahimar/ee3/configuration/TransmutationConfiguration.java
+++ b/src/main/java/com/pahimar/ee3/configuration/TransmutationConfiguration.java
@@ -37,5 +37,4 @@ public class TransmutationConfiguration
             transmutationConfiguration.save();
         }
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/creativetab/CreativeTabEE3.java b/src/main/java/com/pahimar/ee3/creativetab/CreativeTabEE3.java
index 2aef7f0b..0d1f8568 100644
--- a/src/main/java/com/pahimar/ee3/creativetab/CreativeTabEE3.java
+++ b/src/main/java/com/pahimar/ee3/creativetab/CreativeTabEE3.java
@@ -11,7 +11,6 @@ import net.minecraft.creativetab.CreativeTabs;
  * CreativeTabEE3
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class CreativeTabEE3 extends CreativeTabs
 {
@@ -32,5 +31,4 @@ public class CreativeTabEE3 extends CreativeTabs
 
         return ItemIds.MINIUM_SHARD;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/emc/EmcRegistry.java b/src/main/java/com/pahimar/ee3/emc/EmcRegistry.java
index bae5bd93..0a3f8034 100644
--- a/src/main/java/com/pahimar/ee3/emc/EmcRegistry.java
+++ b/src/main/java/com/pahimar/ee3/emc/EmcRegistry.java
@@ -1,9 +1,9 @@
 package com.pahimar.ee3.emc;
 
 import com.google.common.collect.ImmutableSortedMap;
+import com.pahimar.ee3.api.OreStack;
+import com.pahimar.ee3.api.WrappedStack;
 import com.pahimar.ee3.helper.EmcHelper;
-import com.pahimar.ee3.item.OreStack;
-import com.pahimar.ee3.item.WrappedStack;
 import com.pahimar.ee3.item.crafting.RecipeRegistry;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
@@ -391,6 +391,4 @@ public class EmcRegistry
 
         return stacksInRange;
     }
-
-
 }
diff --git a/src/main/java/com/pahimar/ee3/emc/EmcValue.java b/src/main/java/com/pahimar/ee3/emc/EmcValue.java
index 0b724fea..06b249bd 100644
--- a/src/main/java/com/pahimar/ee3/emc/EmcValue.java
+++ b/src/main/java/com/pahimar/ee3/emc/EmcValue.java
@@ -179,9 +179,10 @@ public class EmcValue implements Comparable<EmcValue>, JsonDeserializer<EmcValue
     /**
      * Deserializes an EmcValue object from the given serialized json String
      *
-     * @param jsonEmcValue Json encoded String representing a EmcValue object
-     * @return The EmcValue that was encoded as json, or null if a valid
-     * EmcValue could not be decoded from given String
+     * @param jsonEmcValue
+     *         Json encoded String representing a EmcValue object
+     *
+     * @return The EmcValue that was encoded as json, or null if a valid EmcValue could not be decoded from given String
      */
     @SuppressWarnings("unused")
     public static EmcValue createFromJson(String jsonEmcValue)
diff --git a/src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java b/src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java
index ac841151..fc208d2f 100644
--- a/src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java
+++ b/src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java
@@ -1,7 +1,7 @@
 package com.pahimar.ee3.emc;
 
-import com.pahimar.ee3.item.OreStack;
-import com.pahimar.ee3.item.WrappedStack;
+import com.pahimar.ee3.api.OreStack;
+import com.pahimar.ee3.api.WrappedStack;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/pahimar/ee3/emc/EmcValuesIMC.java b/src/main/java/com/pahimar/ee3/emc/EmcValuesIMC.java
index 02873092..33ae4b65 100644
--- a/src/main/java/com/pahimar/ee3/emc/EmcValuesIMC.java
+++ b/src/main/java/com/pahimar/ee3/emc/EmcValuesIMC.java
@@ -1,6 +1,6 @@
 package com.pahimar.ee3.emc;
 
-import com.pahimar.ee3.item.WrappedStack;
+import com.pahimar.ee3.api.WrappedStack;
 
 import java.util.Map;
 import java.util.TreeMap;
@@ -11,7 +11,6 @@ import java.util.TreeMap;
  * EmcIMCValues
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class EmcValuesIMC
 {
diff --git a/src/main/java/com/pahimar/ee3/event/ActionEvent.java b/src/main/java/com/pahimar/ee3/event/ActionEvent.java
index d797e007..a4c7efcd 100644
--- a/src/main/java/com/pahimar/ee3/event/ActionEvent.java
+++ b/src/main/java/com/pahimar/ee3/event/ActionEvent.java
@@ -11,7 +11,6 @@ import net.minecraftforge.event.Event;
  * ActionEvent
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ActionEvent extends Event
 {
@@ -43,5 +42,4 @@ public class ActionEvent extends Event
         this.hasActionOccured = hasActionOccured;
         this.data = data;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/event/ActionRequestEvent.java b/src/main/java/com/pahimar/ee3/event/ActionRequestEvent.java
index 8a718a00..fc64c1e7 100644
--- a/src/main/java/com/pahimar/ee3/event/ActionRequestEvent.java
+++ b/src/main/java/com/pahimar/ee3/event/ActionRequestEvent.java
@@ -13,7 +13,6 @@ import static net.minecraftforge.event.Event.Result.DENY;
  * ActionRequestEvent
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @Cancelable
 public class ActionRequestEvent extends PlayerEvent
@@ -46,5 +45,4 @@ public class ActionRequestEvent extends PlayerEvent
         super.setCanceled(cancel);
         allowEvent = cancel ? DENY : allowEvent == DENY ? DENY : DEFAULT;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/event/WorldTransmutationEvent.java b/src/main/java/com/pahimar/ee3/event/WorldTransmutationEvent.java
index 55381220..cba59050 100644
--- a/src/main/java/com/pahimar/ee3/event/WorldTransmutationEvent.java
+++ b/src/main/java/com/pahimar/ee3/event/WorldTransmutationEvent.java
@@ -10,7 +10,6 @@ import net.minecraft.world.World;
  * WorldTransmutationEvent
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class WorldTransmutationEvent extends ActionEvent
 {
@@ -25,5 +24,4 @@ public class WorldTransmutationEvent extends ActionEvent
         targetMeta = Integer.parseInt(data.substring(data.indexOf(":") + 1));
         actionResult = ActionResult.DEFAULT;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/handler/ActionRequestHandler.java b/src/main/java/com/pahimar/ee3/handler/ActionRequestHandler.java
index fe666252..8f70eda6 100644
--- a/src/main/java/com/pahimar/ee3/handler/ActionRequestHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/ActionRequestHandler.java
@@ -9,7 +9,6 @@ import net.minecraftforge.event.ForgeSubscribe;
  * ActionRequestHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ActionRequestHandler
 {
@@ -19,5 +18,4 @@ public class ActionRequestHandler
     {
 
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/handler/CraftingHandler.java b/src/main/java/com/pahimar/ee3/handler/CraftingHandler.java
index ee18f46b..15e9326f 100644
--- a/src/main/java/com/pahimar/ee3/handler/CraftingHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/CraftingHandler.java
@@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack;
  * CraftingHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class CraftingHandler implements ICraftingHandler
 {
@@ -35,12 +34,13 @@ public class CraftingHandler implements ICraftingHandler
     }
 
     /**
-     * Check to see if the crafting is occurring from the portable crafting
-     * interface. If so, do durability damage to the appropriate transmutation
-     * stone that was used for portable crafting.
+     * Check to see if the crafting is occurring from the portable crafting interface. If so, do durability damage to
+     * the appropriate transmutation stone that was used for portable crafting.
      *
-     * @param player      The player that is completing the crafting
-     * @param craftMatrix The contents of the crafting matrix
+     * @param player
+     *         The player that is completing the crafting
+     * @param craftMatrix
+     *         The contents of the crafting matrix
      */
     private void doPortableCrafting(EntityPlayer player, IInventory craftMatrix)
     {
diff --git a/src/main/java/com/pahimar/ee3/handler/DrawBlockHighlightHandler.java b/src/main/java/com/pahimar/ee3/handler/DrawBlockHighlightHandler.java
index e35facba..1ec7be4d 100644
--- a/src/main/java/com/pahimar/ee3/handler/DrawBlockHighlightHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/DrawBlockHighlightHandler.java
@@ -24,7 +24,6 @@ import org.lwjgl.opengl.GL12;
  * DrawBlockHighlightHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class DrawBlockHighlightHandler
@@ -214,5 +213,4 @@ public class DrawBlockHighlightHandler
 
         return pulse;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/handler/EntityLivingHandler.java b/src/main/java/com/pahimar/ee3/handler/EntityLivingHandler.java
index 9874b87d..bbc8606f 100644
--- a/src/main/java/com/pahimar/ee3/handler/EntityLivingHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/EntityLivingHandler.java
@@ -13,7 +13,6 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
  * EntityLivingHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class EntityLivingHandler
 {
@@ -43,5 +42,4 @@ public class EntityLivingHandler
             }
         }
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/handler/EquivalencyHandler.java b/src/main/java/com/pahimar/ee3/handler/EquivalencyHandler.java
index 3d416205..e9dbc373 100644
--- a/src/main/java/com/pahimar/ee3/handler/EquivalencyHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/EquivalencyHandler.java
@@ -12,7 +12,6 @@ import java.util.ArrayList;
  * EquivalencyHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class EquivalencyHandler
 {
@@ -51,13 +50,13 @@ public class EquivalencyHandler
         {
             currentList = equivalencyList.get(stack1Index.intValue());
             currentList.add(stack2);
-            equivalencyList.set(stack1Index.intValue(), currentList);
+            equivalencyList.set(stack1Index, currentList);
         }
         else if (stack1Index == null && stack2Index != null)
         {
             currentList = equivalencyList.get(stack2Index.intValue());
             currentList.add(stack1);
-            equivalencyList.set(stack2Index.intValue(), currentList);
+            equivalencyList.set(stack2Index, currentList);
         }
         else if (stack1Index == null && stack2Index == null)
         {
@@ -262,18 +261,9 @@ public class EquivalencyHandler
 
     public boolean areEquivalent(Object obj1, Object obj2)
     {
-
         if (getEquivalencyList(obj1) != null && getEquivalencyList(obj2) != null)
         {
-            // TODO This could be cleaner
-            if (GeneralHelper.convertObjectToItemStack(obj1).itemID == GeneralHelper.convertObjectToItemStack(obj2).itemID && GeneralHelper.convertObjectToItemStack(obj1).getItemDamage() == GeneralHelper.convertObjectToItemStack(obj2).getItemDamage())
-            {
-                return true;
-            }
-            else
-            {
-                return getEquivalencyList(obj1).equals(getEquivalencyList(obj2));
-            }
+            return GeneralHelper.convertObjectToItemStack(obj1).itemID == GeneralHelper.convertObjectToItemStack(obj2).itemID && GeneralHelper.convertObjectToItemStack(obj1).getItemDamage() == GeneralHelper.convertObjectToItemStack(obj2).getItemDamage() || getEquivalencyList(obj1).equals(getEquivalencyList(obj2));
         }
         else
         {
@@ -298,14 +288,7 @@ public class EquivalencyHandler
 
         if (getEquivalencyList(first.itemID, first.getItemDamage()) != null && getEquivalencyList(second.itemID, second.getItemDamage()) != null)
         {
-            if (first.itemID == second.itemID && first.getItemDamage() == second.getItemDamage())
-            {
-                return true;
-            }
-            else
-            {
-                return getEquivalencyList(first.itemID, first.getItemDamage()).equals(getEquivalencyList(second.itemID, second.getItemDamage()));
-            }
+            return first.itemID == second.itemID && first.getItemDamage() == second.getItemDamage() || getEquivalencyList(first.itemID, first.getItemDamage()).equals(getEquivalencyList(second.itemID, second.getItemDamage()));
         }
         else
         {
diff --git a/src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java b/src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java
index ac43d34f..0bf960cf 100644
--- a/src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java
@@ -14,7 +14,6 @@ import net.minecraftforge.event.entity.player.PlayerDropsEvent;
  * ItemEventHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemEventHandler
 {
diff --git a/src/main/java/com/pahimar/ee3/handler/ItemTooltipEventHandler.java b/src/main/java/com/pahimar/ee3/handler/ItemTooltipEventHandler.java
index eeb50497..b36c4f64 100644
--- a/src/main/java/com/pahimar/ee3/handler/ItemTooltipEventHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/ItemTooltipEventHandler.java
@@ -1,10 +1,10 @@
 package com.pahimar.ee3.handler;
 
+import com.pahimar.ee3.api.OreStack;
+import com.pahimar.ee3.api.WrappedStack;
 import com.pahimar.ee3.emc.EmcRegistry;
 import com.pahimar.ee3.emc.EmcType;
 import com.pahimar.ee3.emc.EmcValue;
-import com.pahimar.ee3.item.OreStack;
-import com.pahimar.ee3.item.WrappedStack;
 import com.pahimar.ee3.item.crafting.RecipeRegistry;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.event.ForgeSubscribe;
@@ -16,7 +16,6 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent;
  * ItemTooltipEventHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemTooltipEventHandler
 {
diff --git a/src/main/java/com/pahimar/ee3/handler/KeyBindingHandler.java b/src/main/java/com/pahimar/ee3/handler/KeyBindingHandler.java
index ff4cc916..4a34ab25 100644
--- a/src/main/java/com/pahimar/ee3/handler/KeyBindingHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/KeyBindingHandler.java
@@ -21,7 +21,6 @@ import java.util.EnumSet;
  * KeyBindingHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class KeyBindingHandler extends KeyBindingRegistry.KeyHandler
 {
diff --git a/src/main/java/com/pahimar/ee3/handler/PlayerDestroyItemHandler.java b/src/main/java/com/pahimar/ee3/handler/PlayerDestroyItemHandler.java
index 56788506..92877844 100644
--- a/src/main/java/com/pahimar/ee3/handler/PlayerDestroyItemHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/PlayerDestroyItemHandler.java
@@ -9,7 +9,6 @@ import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
  * PlayerDestroyItemHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class PlayerDestroyItemHandler
 {
@@ -21,5 +20,4 @@ public class PlayerDestroyItemHandler
         // TODO Come back and actually do what I want here
 
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/handler/TransmutationTargetOverlayHandler.java b/src/main/java/com/pahimar/ee3/handler/TransmutationTargetOverlayHandler.java
index 71ce1bae..b98d48e7 100644
--- a/src/main/java/com/pahimar/ee3/handler/TransmutationTargetOverlayHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/TransmutationTargetOverlayHandler.java
@@ -27,7 +27,6 @@ import java.util.EnumSet;
  * TransmutationTargetOverlayHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 @SideOnly(Side.CLIENT)
 public class TransmutationTargetOverlayHandler implements ITickHandler
@@ -158,5 +157,4 @@ public class TransmutationTargetOverlayHandler implements ITickHandler
         GL11.glPopMatrix();
         GL11.glPopMatrix();
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/handler/VersionCheckTickHandler.java b/src/main/java/com/pahimar/ee3/handler/VersionCheckTickHandler.java
index acf17a20..4841913f 100644
--- a/src/main/java/com/pahimar/ee3/handler/VersionCheckTickHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/VersionCheckTickHandler.java
@@ -18,7 +18,6 @@ import java.util.EnumSet;
  * VersionCheckTickHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class VersionCheckTickHandler implements ITickHandler
 {
@@ -76,5 +75,4 @@ public class VersionCheckTickHandler implements ITickHandler
 
         return Reference.MOD_NAME + ": " + this.getClass().getSimpleName();
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/handler/WorldTransmutationHandler.java b/src/main/java/com/pahimar/ee3/handler/WorldTransmutationHandler.java
index 8ae0a0ab..15640629 100644
--- a/src/main/java/com/pahimar/ee3/handler/WorldTransmutationHandler.java
+++ b/src/main/java/com/pahimar/ee3/handler/WorldTransmutationHandler.java
@@ -30,7 +30,6 @@ import net.minecraftforge.event.ForgeSubscribe;
  * WorldTransmutationHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class WorldTransmutationHandler
 {
@@ -204,5 +203,4 @@ public class WorldTransmutationHandler
             event.actionResult = ActionResult.FAILURE;
         }
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/helper/DebugHelper.java b/src/main/java/com/pahimar/ee3/helper/DebugHelper.java
index 94ddf261..2e6d7403 100644
--- a/src/main/java/com/pahimar/ee3/helper/DebugHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/DebugHelper.java
@@ -1,8 +1,8 @@
 package com.pahimar.ee3.helper;
 
+import com.pahimar.ee3.api.OreStack;
+import com.pahimar.ee3.api.WrappedStack;
 import com.pahimar.ee3.emc.EmcRegistry;
-import com.pahimar.ee3.item.OreStack;
-import com.pahimar.ee3.item.WrappedStack;
 import com.pahimar.ee3.item.crafting.RecipeRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.item.ItemStack;
@@ -13,7 +13,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class DebugHelper {
+public class DebugHelper
+{
 
     public static void printOreDictionaryContents()
     {
@@ -36,7 +37,8 @@ public class DebugHelper {
 
         for (String oreName : oreNames)
         {
-            if (!EmcRegistry.hasEmcValue(new OreStack(oreName))) {
+            if (!EmcRegistry.hasEmcValue(new OreStack(oreName)))
+            {
                 LogHelper.debug(String.format("OreStack '%s' requires an EmcValue", oreName));
             }
         }
diff --git a/src/main/java/com/pahimar/ee3/helper/EmcHelper.java b/src/main/java/com/pahimar/ee3/helper/EmcHelper.java
index 2da322c3..42c3e6f5 100644
--- a/src/main/java/com/pahimar/ee3/helper/EmcHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/EmcHelper.java
@@ -1,9 +1,9 @@
 package com.pahimar.ee3.helper;
 
+import com.pahimar.ee3.api.WrappedStack;
 import com.pahimar.ee3.emc.EmcRegistry;
 import com.pahimar.ee3.emc.EmcType;
 import com.pahimar.ee3.emc.EmcValue;
-import com.pahimar.ee3.item.WrappedStack;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 
diff --git a/src/main/java/com/pahimar/ee3/helper/FluidHelper.java b/src/main/java/com/pahimar/ee3/helper/FluidHelper.java
index 0f4faf0e..dd4c84a2 100644
--- a/src/main/java/com/pahimar/ee3/helper/FluidHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/FluidHelper.java
@@ -19,9 +19,11 @@ public class FluidHelper
         // Register Milk in the FluidRegistry if it hasn't already been done
         if (!FluidRegistry.isFluidRegistered("milk"))
         {
-            Fluid milk = new Fluid("milk") {
+            Fluid milk = new Fluid("milk")
+            {
                 @Override
-                public String getLocalizedName() {
+                public String getLocalizedName()
+                {
                     return StatCollector.translateToLocal("item.milk.name");
                 }
             }.setUnlocalizedName(Item.bucketMilk.getUnlocalizedName());
diff --git a/src/main/java/com/pahimar/ee3/helper/GeneralHelper.java b/src/main/java/com/pahimar/ee3/helper/GeneralHelper.java
index a2b84854..3f71c0fc 100644
--- a/src/main/java/com/pahimar/ee3/helper/GeneralHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/GeneralHelper.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
  * GeneralHelper
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class GeneralHelper
 {
@@ -60,5 +59,4 @@ public class GeneralHelper
 
         return entity instanceof IMob;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/helper/ItemHelper.java b/src/main/java/com/pahimar/ee3/helper/ItemHelper.java
index c451a9e5..3f1fa078 100644
--- a/src/main/java/com/pahimar/ee3/helper/ItemHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/ItemHelper.java
@@ -16,7 +16,6 @@ import java.util.Comparator;
  * ItemDropHelper
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemHelper
 {
@@ -24,11 +23,14 @@ public class ItemHelper
     private static double rand;
 
     /**
-     * Compares two ItemStacks for equality, testing itemID, metaData,
-     * stackSize, and their NBTTagCompounds (if they are present)
+     * Compares two ItemStacks for equality, testing itemID, metaData, stackSize, and their NBTTagCompounds (if they are
+     * present)
+     *
+     * @param first
+     *         The first ItemStack being tested for equality
+     * @param second
+     *         The second ItemStack being tested for equality
      *
-     * @param first  The first ItemStack being tested for equality
-     * @param second The second ItemStack being tested for equality
      * @return true if the two ItemStacks are equivalent, false otherwise
      */
     public static boolean equals(ItemStack first, ItemStack second)
@@ -181,8 +183,6 @@ public class ItemHelper
             {
                 return 0;
             }
-
         }
-
     };
 }
diff --git a/src/main/java/com/pahimar/ee3/helper/ItemStackNBTHelper.java b/src/main/java/com/pahimar/ee3/helper/ItemStackNBTHelper.java
index 87dcca56..36e832b2 100644
--- a/src/main/java/com/pahimar/ee3/helper/ItemStackNBTHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/ItemStackNBTHelper.java
@@ -9,7 +9,6 @@ import net.minecraft.nbt.NBTTagCompound;
  * NBTHelper
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemStackNBTHelper
 {
@@ -17,8 +16,8 @@ public class ItemStackNBTHelper
     /**
      * Initializes the NBT Tag Compound for the given ItemStack if it is null
      *
-     * @param itemStack The ItemStack for which its NBT Tag Compound is being checked
-     *                  for initialization
+     * @param itemStack
+     *         The ItemStack for which its NBT Tag Compound is being checked for initialization
      */
     private static void initNBTTagCompound(ItemStack itemStack)
     {
@@ -31,13 +30,7 @@ public class ItemStackNBTHelper
 
     public static boolean hasTag(ItemStack itemStack, String keyName)
     {
-
-        if (itemStack.stackTagCompound != null)
-        {
-            return itemStack.stackTagCompound.hasKey(keyName);
-        }
-
-        return false;
+        return itemStack.stackTagCompound != null && itemStack.stackTagCompound.hasKey(keyName);
     }
 
     public static void removeTag(ItemStack itemStack, String keyName)
@@ -224,5 +217,4 @@ public class ItemStackNBTHelper
 
         itemStack.stackTagCompound.setDouble(keyName, keyValue);
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/helper/KeyBindingHelper.java b/src/main/java/com/pahimar/ee3/helper/KeyBindingHelper.java
index 697f4872..6926d20e 100644
--- a/src/main/java/com/pahimar/ee3/helper/KeyBindingHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/KeyBindingHelper.java
@@ -11,7 +11,6 @@ import java.util.ArrayList;
  * KeyBindingHelper
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class KeyBindingHelper
 {
@@ -54,7 +53,7 @@ public class KeyBindingHelper
 
         for (int x = 0; x < isRepeating.length; x++)
         {
-            isRepeating[x] = isRepeatingList.get(x).booleanValue();
+            isRepeating[x] = isRepeatingList.get(x);
         }
 
         return isRepeating;
diff --git a/src/main/java/com/pahimar/ee3/helper/LogHelper.java b/src/main/java/com/pahimar/ee3/helper/LogHelper.java
index ac6c5454..f3ac70a6 100644
--- a/src/main/java/com/pahimar/ee3/helper/LogHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/LogHelper.java
@@ -12,7 +12,6 @@ import java.util.logging.Logger;
  * LogHelper
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class LogHelper
 {
diff --git a/src/main/java/com/pahimar/ee3/helper/QualityHelper.java b/src/main/java/com/pahimar/ee3/helper/QualityHelper.java
index b29b5d69..4436934c 100644
--- a/src/main/java/com/pahimar/ee3/helper/QualityHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/QualityHelper.java
@@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack;
  * QualityHelper
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class QualityHelper
 {
@@ -42,5 +41,4 @@ public class QualityHelper
 
         return -1;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/helper/RecipeHelper.java b/src/main/java/com/pahimar/ee3/helper/RecipeHelper.java
index ef67e83b..f751cccd 100644
--- a/src/main/java/com/pahimar/ee3/helper/RecipeHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/RecipeHelper.java
@@ -1,8 +1,8 @@
 package com.pahimar.ee3.helper;
 
-import com.pahimar.ee3.item.EnergyStack;
-import com.pahimar.ee3.item.OreStack;
-import com.pahimar.ee3.item.WrappedStack;
+import com.pahimar.ee3.api.EnergyStack;
+import com.pahimar.ee3.api.OreStack;
+import com.pahimar.ee3.api.WrappedStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.ShapedRecipes;
@@ -20,7 +20,6 @@ import java.util.List;
  * RecipeHelper
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class RecipeHelper
 {
@@ -28,9 +27,10 @@ public class RecipeHelper
     /**
      * Returns a list of elements that constitute the input in a crafting recipe
      *
-     * @param recipe The IRecipe being examined
-     * @return List of elements that constitute the input of the given IRecipe.
-     * Could be an ItemStack or an Arraylist
+     * @param recipe
+     *         The IRecipe being examined
+     *
+     * @return List of elements that constitute the input of the given IRecipe. Could be an ItemStack or an Arraylist
      */
     public static ArrayList<WrappedStack> getRecipeInputs(IRecipe recipe)
     {
@@ -146,10 +146,11 @@ public class RecipeHelper
     }
 
     /**
-     * Collates an uncollated, unsorted List of Objects into a sorted, collated
-     * List of WrappedStacks
+     * Collates an uncollated, unsorted List of Objects into a sorted, collated List of WrappedStacks
+     *
+     * @param uncollatedStacks
+     *         List of objects for collating
      *
-     * @param uncollatedStacks List of objects for collating
      * @return A sorted, collated List of WrappedStacks
      */
     public static List<WrappedStack> collateInputStacks(List<?> uncollatedStacks)
@@ -196,7 +197,6 @@ public class RecipeHelper
                                     collatedStacks.get(i).setStackSize(collatedStacks.get(i).getStackSize() + stack.getStackSize());
                                     found = true;
                                 }
-
                             }
                             else if (stack.getWrappedStack() instanceof EnergyStack && collatedStacks.get(i).getWrappedStack() instanceof EnergyStack)
                             {
@@ -215,7 +215,6 @@ public class RecipeHelper
                     }
                 }
             }
-
         }
         Collections.sort(collatedStacks);
         return collatedStacks;
diff --git a/src/main/java/com/pahimar/ee3/helper/TransmutationHelper.java b/src/main/java/com/pahimar/ee3/helper/TransmutationHelper.java
index e073ef35..5f0ff463 100644
--- a/src/main/java/com/pahimar/ee3/helper/TransmutationHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/TransmutationHelper.java
@@ -15,7 +15,6 @@ import java.util.ArrayList;
  * TransmutationHelper
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class TransmutationHelper
 {
@@ -177,5 +176,4 @@ public class TransmutationHelper
         // In the event the list is null, return null
         return prevStack;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/helper/VersionHelper.java b/src/main/java/com/pahimar/ee3/helper/VersionHelper.java
index 16b1a499..987f7f74 100644
--- a/src/main/java/com/pahimar/ee3/helper/VersionHelper.java
+++ b/src/main/java/com/pahimar/ee3/helper/VersionHelper.java
@@ -46,9 +46,8 @@ public class VersionHelper implements Runnable
     public static String remoteUpdateLocation = null;
 
     /**
-     * Checks the version of the currently running instance of the mod against
-     * the remote version authority, and sets the result of the check
-     * appropriately
+     * Checks the version of the currently running instance of the mod against the remote version authority, and sets
+     * the result of the check appropriately
      */
     public static void checkVersion()
     {
@@ -94,7 +93,6 @@ public class VersionHelper implements Runnable
                         result = OUTDATED;
                     }
                 }
-
             }
             else
             {
diff --git a/src/main/java/com/pahimar/ee3/imc/InterModCommsHandler.java b/src/main/java/com/pahimar/ee3/imc/InterModCommsHandler.java
index 557ccbb8..337a3c68 100644
--- a/src/main/java/com/pahimar/ee3/imc/InterModCommsHandler.java
+++ b/src/main/java/com/pahimar/ee3/imc/InterModCommsHandler.java
@@ -5,10 +5,10 @@ import com.google.gson.Gson;
 import com.pahimar.ee3.EquivalentExchange3;
 import com.pahimar.ee3.api.RecipeMapping;
 import com.pahimar.ee3.api.StackValueMapping;
+import com.pahimar.ee3.api.WrappedStack;
 import com.pahimar.ee3.emc.EmcRegistry;
 import com.pahimar.ee3.emc.EmcValue;
 import com.pahimar.ee3.emc.EmcValuesIMC;
-import com.pahimar.ee3.item.WrappedStack;
 import com.pahimar.ee3.item.crafting.RecipesIMC;
 import com.pahimar.ee3.lib.Reference;
 import cpw.mods.fml.common.IScheduledTickHandler;
@@ -224,7 +224,6 @@ public class InterModCommsHandler implements ITickHandler, IScheduledTickHandler
                     imcMessage.getSender(),
                     InterModCommsOperations.EMC_RETURN_GET_VALUE,
                     String.format("%s==%s", gson.toJson(itemStack), EmcRegistry.getEmcValue(itemStack).toJson()));
-
         }
         else
         {
diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java b/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java
index 695b9c03..ae843ab4 100644
--- a/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java
+++ b/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java
@@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack;
  * ContainerAlchemicalBag
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ContainerAlchemicalBag extends Container
 {
diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java b/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java
index 14c52f90..310bbc6d 100644
--- a/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java
+++ b/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java
@@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
  * ContainerAlchemicalChest
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ContainerAlchemicalChest extends Container
 {
diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerAludel.java b/src/main/java/com/pahimar/ee3/inventory/ContainerAludel.java
index 3bcc90c0..4a528fb0 100644
--- a/src/main/java/com/pahimar/ee3/inventory/ContainerAludel.java
+++ b/src/main/java/com/pahimar/ee3/inventory/ContainerAludel.java
@@ -15,7 +15,6 @@ import net.minecraft.tileentity.TileEntityFurnace;
  * ContainerAludel
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ContainerAludel extends Container
 {
diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java b/src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java
index a625780c..f8ded0f4 100644
--- a/src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java
+++ b/src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java
@@ -14,7 +14,6 @@ import net.minecraft.tileentity.TileEntityFurnace;
  * ContainerCalcinator
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ContainerCalcinator extends Container
 {
@@ -118,5 +117,4 @@ public class ContainerCalcinator extends Container
 
         return itemStack;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java b/src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java
index 833d96c1..8d0beee9 100644
--- a/src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java
+++ b/src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java
@@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
  * ContainerGlassBell
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ContainerGlassBell extends Container
 {
diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerPortableCrafting.java b/src/main/java/com/pahimar/ee3/inventory/ContainerPortableCrafting.java
index 72d1a6e4..8a76baec 100644
--- a/src/main/java/com/pahimar/ee3/inventory/ContainerPortableCrafting.java
+++ b/src/main/java/com/pahimar/ee3/inventory/ContainerPortableCrafting.java
@@ -14,7 +14,6 @@ import net.minecraft.world.World;
  * ContainerPortableCrafting
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ContainerPortableCrafting extends ContainerWorkbench
 {
@@ -53,5 +52,4 @@ public class ContainerPortableCrafting extends ContainerWorkbench
             }
         }
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java b/src/main/java/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java
index e5c36912..2d378f7b 100644
--- a/src/main/java/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java
+++ b/src/main/java/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java
@@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
  * ContainerPortableTransmutation
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ContainerPortableTransmutation extends Container
 {
diff --git a/src/main/java/com/pahimar/ee3/inventory/SlotCalcinator.java b/src/main/java/com/pahimar/ee3/inventory/SlotCalcinator.java
index d5d85d2f..30c7d6c3 100644
--- a/src/main/java/com/pahimar/ee3/inventory/SlotCalcinator.java
+++ b/src/main/java/com/pahimar/ee3/inventory/SlotCalcinator.java
@@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack;
  * SlotCalcinator
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class SlotCalcinator extends Slot
 {
@@ -27,5 +26,4 @@ public class SlotCalcinator extends Slot
 
         return false;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/item/IChargeable.java b/src/main/java/com/pahimar/ee3/item/IChargeable.java
index bf93bdc2..15006aa0 100644
--- a/src/main/java/com/pahimar/ee3/item/IChargeable.java
+++ b/src/main/java/com/pahimar/ee3/item/IChargeable.java
@@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack;
  * IChargeable
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public interface IChargeable
 {
@@ -20,5 +19,4 @@ public interface IChargeable
     public abstract void increaseCharge(ItemStack stack);
 
     public abstract void decreaseCharge(ItemStack stack);
-
 }
diff --git a/src/main/java/com/pahimar/ee3/item/IKeyBound.java b/src/main/java/com/pahimar/ee3/item/IKeyBound.java
index 49c39e4d..e5874c05 100644
--- a/src/main/java/com/pahimar/ee3/item/IKeyBound.java
+++ b/src/main/java/com/pahimar/ee3/item/IKeyBound.java
@@ -9,11 +9,9 @@ import net.minecraft.item.ItemStack;
  * IKeyBound
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public interface IKeyBound
 {
 
     public abstract void doKeyBindingAction(EntityPlayer thePlayer, ItemStack itemStack, String keyBinding);
-
 }
diff --git a/src/main/java/com/pahimar/ee3/item/ITransmutationStone.java b/src/main/java/com/pahimar/ee3/item/ITransmutationStone.java
index 720d55c4..246f638d 100644
--- a/src/main/java/com/pahimar/ee3/item/ITransmutationStone.java
+++ b/src/main/java/com/pahimar/ee3/item/ITransmutationStone.java
@@ -10,7 +10,6 @@ import net.minecraft.world.World;
  * ITransmutationStone
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public interface ITransmutationStone
 {
@@ -20,5 +19,4 @@ public interface ITransmutationStone
     public abstract void openPortableTransmutationGUI(EntityPlayer thePlayer, ItemStack itemStack);
 
     public abstract void transmuteBlock(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int sideHit);
-
 }
diff --git a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalBag.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalBag.java
index 7aea4134..5ba3af35 100644
--- a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalBag.java
+++ b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalBag.java
@@ -21,12 +21,11 @@ import net.minecraft.world.World;
  * ItemAlchemicalBag
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemAlchemicalBag extends ItemEE
 {
 
-    private static final String[] ALCHEMICAL_BAG_SUBTYPES = new String[] {"Open", "OpenDrawString", "Closed", "ClosedDrawString"};
+    private static final String[] ALCHEMICAL_BAG_SUBTYPES = new String[]{"Open", "OpenDrawString", "Closed", "ClosedDrawString"};
 
     @SideOnly(Side.CLIENT)
     private Icon[] icons;
diff --git a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalChalk.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalChalk.java
index 0120f084..06051346 100644
--- a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalChalk.java
+++ b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalChalk.java
@@ -13,5 +13,4 @@ public class ItemAlchemicalChalk extends ItemEE
         this.setUnlocalizedName(Strings.RESOURCE_PREFIX + Strings.ALCHEMICAL_CHALK_NAME);
         this.setCreativeTab(EquivalentExchange3.tabsEE3);
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java
index e55a8fde..2c590564 100644
--- a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java
+++ b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java
@@ -19,12 +19,11 @@ import java.util.List;
  * ItemAlchemicalDust
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemAlchemicalDust extends ItemEE
 {
 
-    private static final String[] ALCHEMICAL_DUST_NAMES = new String[] {"Ash", "Minium", "Verdant", "Azure", "Amaranthine", "Iridescent"};
+    private static final String[] ALCHEMICAL_DUST_NAMES = new String[]{"Ash", "Minium", "Verdant", "Azure", "Amaranthine", "Iridescent"};
 
     @SideOnly(Side.CLIENT)
     private Icon[] icons;
diff --git a/src/main/java/com/pahimar/ee3/item/ItemEE.java b/src/main/java/com/pahimar/ee3/item/ItemEE.java
index 12094906..f7575685 100644
--- a/src/main/java/com/pahimar/ee3/item/ItemEE.java
+++ b/src/main/java/com/pahimar/ee3/item/ItemEE.java
@@ -12,7 +12,6 @@ import net.minecraft.item.Item;
  * ItemEE
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemEE extends Item
 {
diff --git a/src/main/java/com/pahimar/ee3/item/ItemInertStone.java b/src/main/java/com/pahimar/ee3/item/ItemInertStone.java
index 203aad55..c3d99526 100644
--- a/src/main/java/com/pahimar/ee3/item/ItemInertStone.java
+++ b/src/main/java/com/pahimar/ee3/item/ItemInertStone.java
@@ -9,7 +9,6 @@ import com.pahimar.ee3.lib.Strings;
  * ItemInertStone
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemInertStone extends ItemEE
 {
diff --git a/src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java b/src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java
index 6928b5ce..0446a126 100644
--- a/src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java
+++ b/src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java
@@ -9,7 +9,6 @@ import com.pahimar.ee3.lib.Strings;
  * ItemMiniumShard
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemMiniumShard extends ItemEE
 {
diff --git a/src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java b/src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java
index c9ae562c..83ad8feb 100644
--- a/src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java
+++ b/src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java
@@ -19,7 +19,6 @@ import net.minecraft.world.World;
  * ItemMiniumStone
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemMiniumStone extends ItemEE
         implements ITransmutationStone, IKeyBound
@@ -140,7 +139,5 @@ public class ItemMiniumStone extends ItemEE
                 }
             }
         }
-
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java b/src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java
index 0502a82b..ac8be874 100644
--- a/src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java
+++ b/src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java
@@ -23,7 +23,6 @@ import net.minecraft.world.World;
  * ItemPhilosophersStone
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemPhilosophersStone extends ItemEE
         implements ITransmutationStone, IChargeable, IKeyBound
@@ -211,7 +210,5 @@ public class ItemPhilosophersStone extends ItemEE
                 }
             }
         }
-
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/item/ModItems.java b/src/main/java/com/pahimar/ee3/item/ModItems.java
index 7e881406..e51a7289 100644
--- a/src/main/java/com/pahimar/ee3/item/ModItems.java
+++ b/src/main/java/com/pahimar/ee3/item/ModItems.java
@@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack;
  * ModItems
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ModItems
 {
@@ -53,8 +52,8 @@ public class ModItems
         GameRegistry.registerItem(alchemicalChalk, Strings.ALCHEMICAL_CHALK_NAME);
 
         // Add recipes for items
-        GameRegistry.addRecipe(new ItemStack(inertStone), new Object[] {"sis", "igi", "sis", 's', Block.stone, 'i', Item.ingotIron, 'g', Item.ingotGold});
-        GameRegistry.addRecipe(new ItemStack(miniumStone), new Object[] {"sss", "sis", "sss", 's', miniumShard, 'i', inertStone});
+        GameRegistry.addRecipe(new ItemStack(inertStone), new Object[]{"sis", "igi", "sis", 's', Block.stone, 'i', Item.ingotIron, 'g', Item.ingotGold});
+        GameRegistry.addRecipe(new ItemStack(miniumStone), new Object[]{"sss", "sis", "sss", 's', miniumShard, 'i', inertStone});
         GameRegistry.addShapelessRecipe(new ItemStack(alchemicalChalk), new ItemStack(Item.clay), new ItemStack(Item.dyePowder.itemID, 1, 15), new ItemStack(Item.dyePowder.itemID, 1, 15), new ItemStack(Item.dyePowder.itemID, 1, 15), new ItemStack(Item.dyePowder.itemID, 1, 15));
     }
 }
diff --git a/src/main/java/com/pahimar/ee3/item/crafting/RecipeRegistry.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipeRegistry.java
index 30cae0cd..be2326f8 100644
--- a/src/main/java/com/pahimar/ee3/item/crafting/RecipeRegistry.java
+++ b/src/main/java/com/pahimar/ee3/item/crafting/RecipeRegistry.java
@@ -2,7 +2,7 @@ package com.pahimar.ee3.item.crafting;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.item.WrappedStack;
+import com.pahimar.ee3.api.WrappedStack;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
@@ -39,36 +39,48 @@ public class RecipeRegistry
     private void init()
     {
         // Add recipes in the vanilla crafting manager
-        for (WrappedStack outputStack : RecipesVanilla.getVanillaRecipes().keySet()) {
-            for (List<WrappedStack> inputStacks : RecipesVanilla.getVanillaRecipes().get(outputStack)) {
-                if (!recipeMap.get(outputStack).contains(inputStacks)) {
+        for (WrappedStack outputStack : RecipesVanilla.getVanillaRecipes().keySet())
+        {
+            for (List<WrappedStack> inputStacks : RecipesVanilla.getVanillaRecipes().get(outputStack))
+            {
+                if (!recipeMap.get(outputStack).contains(inputStacks))
+                {
                     recipeMap.put(outputStack, inputStacks);
                 }
             }
         }
 
         // Add fluid container recipes
-        for (WrappedStack outputStack : RecipesFluidContainers.getFluidContainerRecipes().keySet()) {
-            for (List<WrappedStack> inputStacks : RecipesFluidContainers.getFluidContainerRecipes().get(outputStack)) {
-                if (!recipeMap.get(outputStack).contains(inputStacks)) {
+        for (WrappedStack outputStack : RecipesFluidContainers.getFluidContainerRecipes().keySet())
+        {
+            for (List<WrappedStack> inputStacks : RecipesFluidContainers.getFluidContainerRecipes().get(outputStack))
+            {
+                if (!recipeMap.get(outputStack).contains(inputStacks))
+                {
                     recipeMap.put(outputStack, inputStacks);
                 }
             }
         }
 
         // Add potion recipes
-        for (WrappedStack outputStack : RecipesPotions.getPotionRecipes().keySet()) {
-            for (List<WrappedStack> inputStacks : RecipesPotions.getPotionRecipes().get(outputStack)) {
-                if (!recipeMap.get(outputStack).contains(inputStacks)) {
+        for (WrappedStack outputStack : RecipesPotions.getPotionRecipes().keySet())
+        {
+            for (List<WrappedStack> inputStacks : RecipesPotions.getPotionRecipes().get(outputStack))
+            {
+                if (!recipeMap.get(outputStack).contains(inputStacks))
+                {
                     recipeMap.put(outputStack, inputStacks);
                 }
             }
         }
 
         // Add recipes gathered via IMC
-        for (WrappedStack outputStack : RecipesIMC.getIMCRecipes().keySet()) {
-            for (List<WrappedStack> inputStacks : RecipesIMC.getIMCRecipes().get(outputStack)) {
-                if (!recipeMap.get(outputStack).contains(inputStacks)) {
+        for (WrappedStack outputStack : RecipesIMC.getIMCRecipes().keySet())
+        {
+            for (List<WrappedStack> inputStacks : RecipesIMC.getIMCRecipes().get(outputStack))
+            {
+                if (!recipeMap.get(outputStack).contains(inputStacks))
+                {
                     recipeMap.put(outputStack, inputStacks);
                 }
             }
diff --git a/src/main/java/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java
index d8ab0b65..958bd722 100644
--- a/src/main/java/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java
+++ b/src/main/java/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
  * RecipesAlchemicalBagDyes
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class RecipesAlchemicalBagDyes implements IRecipe
 {
@@ -167,5 +166,4 @@ public class RecipesAlchemicalBagDyes implements IRecipe
 
         return null;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/item/crafting/RecipesFluidContainers.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesFluidContainers.java
index 0cc5dcbc..8038aeda 100644
--- a/src/main/java/com/pahimar/ee3/item/crafting/RecipesFluidContainers.java
+++ b/src/main/java/com/pahimar/ee3/item/crafting/RecipesFluidContainers.java
@@ -2,7 +2,7 @@ package com.pahimar.ee3.item.crafting;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.item.WrappedStack;
+import com.pahimar.ee3.api.WrappedStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
 
diff --git a/src/main/java/com/pahimar/ee3/item/crafting/RecipesIMC.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesIMC.java
index c5244c28..43e27e16 100644
--- a/src/main/java/com/pahimar/ee3/item/crafting/RecipesIMC.java
+++ b/src/main/java/com/pahimar/ee3/item/crafting/RecipesIMC.java
@@ -2,8 +2,8 @@ package com.pahimar.ee3.item.crafting;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import com.pahimar.ee3.api.WrappedStack;
 import com.pahimar.ee3.helper.RecipeHelper;
-import com.pahimar.ee3.item.WrappedStack;
 
 import java.util.List;
 
@@ -13,7 +13,6 @@ import java.util.List;
  * RecipesIMC
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class RecipesIMC
 {
diff --git a/src/main/java/com/pahimar/ee3/item/crafting/RecipesPotions.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesPotions.java
index d7dbbf56..ecb35306 100644
--- a/src/main/java/com/pahimar/ee3/item/crafting/RecipesPotions.java
+++ b/src/main/java/com/pahimar/ee3/item/crafting/RecipesPotions.java
@@ -2,7 +2,7 @@ package com.pahimar.ee3.item.crafting;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
-import com.pahimar.ee3.item.WrappedStack;
+import com.pahimar.ee3.api.WrappedStack;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/com/pahimar/ee3/item/crafting/RecipesVanilla.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesVanilla.java
index 02096aa2..441675e0 100644
--- a/src/main/java/com/pahimar/ee3/item/crafting/RecipesVanilla.java
+++ b/src/main/java/com/pahimar/ee3/item/crafting/RecipesVanilla.java
@@ -2,8 +2,8 @@ package com.pahimar.ee3.item.crafting;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import com.pahimar.ee3.api.WrappedStack;
 import com.pahimar.ee3.helper.RecipeHelper;
-import com.pahimar.ee3.item.WrappedStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
diff --git a/src/main/java/com/pahimar/ee3/lib/ActionTypes.java b/src/main/java/com/pahimar/ee3/lib/ActionTypes.java
index 06731e29..fbb42053 100644
--- a/src/main/java/com/pahimar/ee3/lib/ActionTypes.java
+++ b/src/main/java/com/pahimar/ee3/lib/ActionTypes.java
@@ -6,11 +6,9 @@ package com.pahimar.ee3.lib;
  * ActionTypes
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ActionTypes
 {
 
     public static final byte TRANSMUTATION = 0;
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/BlockIds.java b/src/main/java/com/pahimar/ee3/lib/BlockIds.java
index febc2716..f80c42ad 100644
--- a/src/main/java/com/pahimar/ee3/lib/BlockIds.java
+++ b/src/main/java/com/pahimar/ee3/lib/BlockIds.java
@@ -20,5 +20,4 @@ public class BlockIds
     public static int ALUDEL_BASE;
     public static int ALCHEMICAL_CHEST;
     public static int GLASS_BELL;
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/Colours.java b/src/main/java/com/pahimar/ee3/lib/Colours.java
index 9376bece..972b29f2 100644
--- a/src/main/java/com/pahimar/ee3/lib/Colours.java
+++ b/src/main/java/com/pahimar/ee3/lib/Colours.java
@@ -15,5 +15,4 @@ public class Colours
     /* Text colour related constants */
     public static final String TEXT_COLOUR_PREFIX_YELLOW = "\u00a7e";
     public static final String TEXT_COLOUR_PREFIX_WHITE = "\u00a7f";
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/Compare.java b/src/main/java/com/pahimar/ee3/lib/Compare.java
index 06bf35be..64a19eb2 100644
--- a/src/main/java/com/pahimar/ee3/lib/Compare.java
+++ b/src/main/java/com/pahimar/ee3/lib/Compare.java
@@ -7,5 +7,4 @@ public class Compare
     public static final int LESSER_THAN = -1;
     public static final int EQUALS = 0;
     public static final int GREATER_THAN = 1;
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/GuiIds.java b/src/main/java/com/pahimar/ee3/lib/GuiIds.java
index bb0647bf..8d606817 100644
--- a/src/main/java/com/pahimar/ee3/lib/GuiIds.java
+++ b/src/main/java/com/pahimar/ee3/lib/GuiIds.java
@@ -18,5 +18,4 @@ public class GuiIds
     public static final int ALCHEMICAL_BAG = 5;
     public static final int SHARED_ALCHEMICAL_INVENTORY = 6;
     public static final int GLASS_BELL = 7;
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/ItemIds.java b/src/main/java/com/pahimar/ee3/lib/ItemIds.java
index ed51ef8f..5100e3ec 100644
--- a/src/main/java/com/pahimar/ee3/lib/ItemIds.java
+++ b/src/main/java/com/pahimar/ee3/lib/ItemIds.java
@@ -27,5 +27,4 @@ public class ItemIds
     public static int ALCHEMICAL_DUST;
     public static int ALCHEMICAL_BAG;
     public static int ALCHEMICAL_CHALK;
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/ItemUpdateTypes.java b/src/main/java/com/pahimar/ee3/lib/ItemUpdateTypes.java
index 004ac976..79ff7244 100644
--- a/src/main/java/com/pahimar/ee3/lib/ItemUpdateTypes.java
+++ b/src/main/java/com/pahimar/ee3/lib/ItemUpdateTypes.java
@@ -6,11 +6,9 @@ package com.pahimar.ee3.lib;
  * ItemUpdateTypes
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ItemUpdateTypes
 {
 
     public static final byte DESTROYED = 0;
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/Models.java b/src/main/java/com/pahimar/ee3/lib/Models.java
index ffb808dc..627fdaa4 100644
--- a/src/main/java/com/pahimar/ee3/lib/Models.java
+++ b/src/main/java/com/pahimar/ee3/lib/Models.java
@@ -9,5 +9,4 @@ public class Models
     public static final String ALUDEL = MODEL_LOCATION + "aludel.obj";
     public static final String CALCINATOR = MODEL_LOCATION + "calcinator.obj";
     public static final String GLASS_BELL = MODEL_LOCATION + "aludel.obj";
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/Reference.java b/src/main/java/com/pahimar/ee3/lib/Reference.java
index dc53036a..bd0bd848 100644
--- a/src/main/java/com/pahimar/ee3/lib/Reference.java
+++ b/src/main/java/com/pahimar/ee3/lib/Reference.java
@@ -11,7 +11,6 @@ import java.util.Properties;
  * Reference
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class Reference
 {
diff --git a/src/main/java/com/pahimar/ee3/lib/RenderIds.java b/src/main/java/com/pahimar/ee3/lib/RenderIds.java
index 30c25592..9b75d402 100644
--- a/src/main/java/com/pahimar/ee3/lib/RenderIds.java
+++ b/src/main/java/com/pahimar/ee3/lib/RenderIds.java
@@ -6,7 +6,6 @@ package com.pahimar.ee3.lib;
  * RenderIds
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class RenderIds
 {
@@ -15,5 +14,4 @@ public class RenderIds
     public static int aludelRender;
     public static int alchemicalChestRender;
     public static int glassBell;
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/Sounds.java b/src/main/java/com/pahimar/ee3/lib/Sounds.java
index 5b0cdf2e..72d22312 100644
--- a/src/main/java/com/pahimar/ee3/lib/Sounds.java
+++ b/src/main/java/com/pahimar/ee3/lib/Sounds.java
@@ -34,5 +34,4 @@ public class Sounds
     public static final String CHEST_OPEN = "random.chestopen";
     public static final String CHEST_CLOSE = "random.chestclosed";
     public static final String CHARGE_FAIL = FAIL;
-
 }
diff --git a/src/main/java/com/pahimar/ee3/lib/Textures.java b/src/main/java/com/pahimar/ee3/lib/Textures.java
index 45b70db3..8576b6af 100644
--- a/src/main/java/com/pahimar/ee3/lib/Textures.java
+++ b/src/main/java/com/pahimar/ee3/lib/Textures.java
@@ -10,7 +10,6 @@ import net.minecraft.util.ResourceLocation;
  * Sprites
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class Textures
 {
@@ -44,5 +43,4 @@ public class Textures
 
     // Effect textures
     public static final ResourceLocation EFFECT_WORLD_TRANSMUTATION = ResourceLocationHelper.getResourceLocation(EFFECTS_LOCATION + "noise.png");
-
 }
diff --git a/src/main/java/com/pahimar/ee3/network/PacketHandler.java b/src/main/java/com/pahimar/ee3/network/PacketHandler.java
index 83128a87..1a3e4d1d 100644
--- a/src/main/java/com/pahimar/ee3/network/PacketHandler.java
+++ b/src/main/java/com/pahimar/ee3/network/PacketHandler.java
@@ -12,19 +12,19 @@ import net.minecraft.network.packet.Packet250CustomPayload;
  * PacketHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class PacketHandler implements IPacketHandler
 {
 
     /**
-     * Handles Packet250CustomPayload packets that are registered to an
-     * Equivalent Exchange 3 network channel
+     * Handles Packet250CustomPayload packets that are registered to an Equivalent Exchange 3 network channel
      *
-     * @param manager The NetworkManager associated with the current platform
-     *                (client/server)
-     * @param packet  The Packet250CustomPayload that was received
-     * @param player  The Player associated with the packet
+     * @param manager
+     *         The NetworkManager associated with the current platform (client/server)
+     * @param packet
+     *         The Packet250CustomPayload that was received
+     * @param player
+     *         The Player associated with the packet
      */
     @Override
     public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
@@ -36,5 +36,4 @@ public class PacketHandler implements IPacketHandler
         // Execute the appropriate actions based on the PacketEE type
         packetEE.execute(manager, player);
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/network/PacketTypeHandler.java b/src/main/java/com/pahimar/ee3/network/PacketTypeHandler.java
index db8942b4..e1feae23 100644
--- a/src/main/java/com/pahimar/ee3/network/PacketTypeHandler.java
+++ b/src/main/java/com/pahimar/ee3/network/PacketTypeHandler.java
@@ -14,7 +14,6 @@ import java.io.DataInputStream;
  * PacketTypeHandler
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public enum PacketTypeHandler
 {
diff --git a/src/main/java/com/pahimar/ee3/network/packet/PacketEE.java b/src/main/java/com/pahimar/ee3/network/packet/PacketEE.java
index 769d2934..4d646746 100644
--- a/src/main/java/com/pahimar/ee3/network/packet/PacketEE.java
+++ b/src/main/java/com/pahimar/ee3/network/packet/PacketEE.java
@@ -15,7 +15,6 @@ import java.io.IOException;
  * PacketEE
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class PacketEE
 {
diff --git a/src/main/java/com/pahimar/ee3/network/packet/PacketItemUpdate.java b/src/main/java/com/pahimar/ee3/network/packet/PacketItemUpdate.java
index ad0bc2b6..68869c54 100644
--- a/src/main/java/com/pahimar/ee3/network/packet/PacketItemUpdate.java
+++ b/src/main/java/com/pahimar/ee3/network/packet/PacketItemUpdate.java
@@ -17,7 +17,6 @@ import java.io.IOException;
  * PacketItemUpdate
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class PacketItemUpdate extends PacketEE
 {
diff --git a/src/main/java/com/pahimar/ee3/network/packet/PacketKeyPressed.java b/src/main/java/com/pahimar/ee3/network/packet/PacketKeyPressed.java
index 3969fd21..a6e02eee 100644
--- a/src/main/java/com/pahimar/ee3/network/packet/PacketKeyPressed.java
+++ b/src/main/java/com/pahimar/ee3/network/packet/PacketKeyPressed.java
@@ -16,7 +16,6 @@ import java.io.IOException;
  * PacketKeyPressed
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class PacketKeyPressed extends PacketEE
 {
diff --git a/src/main/java/com/pahimar/ee3/network/packet/PacketRequestEvent.java b/src/main/java/com/pahimar/ee3/network/packet/PacketRequestEvent.java
index c89daf97..cd004044 100644
--- a/src/main/java/com/pahimar/ee3/network/packet/PacketRequestEvent.java
+++ b/src/main/java/com/pahimar/ee3/network/packet/PacketRequestEvent.java
@@ -16,7 +16,6 @@ import java.io.IOException;
  * PacketRequestEvent
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class PacketRequestEvent extends PacketEE
 {
diff --git a/src/main/java/com/pahimar/ee3/network/packet/PacketSoundEvent.java b/src/main/java/com/pahimar/ee3/network/packet/PacketSoundEvent.java
index e2cd9c05..14a5f0ed 100644
--- a/src/main/java/com/pahimar/ee3/network/packet/PacketSoundEvent.java
+++ b/src/main/java/com/pahimar/ee3/network/packet/PacketSoundEvent.java
@@ -18,7 +18,6 @@ import java.io.IOException;
  * PacketSoundEvent
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class PacketSoundEvent extends PacketEE
 {
diff --git a/src/main/java/com/pahimar/ee3/network/packet/PacketSpawnParticle.java b/src/main/java/com/pahimar/ee3/network/packet/PacketSpawnParticle.java
index 65071c0f..e91d649a 100644
--- a/src/main/java/com/pahimar/ee3/network/packet/PacketSpawnParticle.java
+++ b/src/main/java/com/pahimar/ee3/network/packet/PacketSpawnParticle.java
@@ -16,7 +16,6 @@ import java.io.IOException;
  * PacketSpawnParticle
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class PacketSpawnParticle extends PacketEE
 {
@@ -55,7 +54,6 @@ public class PacketSpawnParticle extends PacketEE
         data.writeDouble(velocityX);
         data.writeDouble(velocityY);
         data.writeDouble(velocityZ);
-
     }
 
     @Override
@@ -69,7 +67,6 @@ public class PacketSpawnParticle extends PacketEE
         velocityX = data.readDouble();
         velocityY = data.readDouble();
         velocityZ = data.readDouble();
-
     }
 
     @Override
@@ -83,5 +80,4 @@ public class PacketSpawnParticle extends PacketEE
             thePlayer.worldObj.spawnParticle(particleName, x, y, z, velocityX, velocityY, velocityZ);
         }
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/network/packet/PacketTileUpdate.java b/src/main/java/com/pahimar/ee3/network/packet/PacketTileUpdate.java
index ea6a13e5..6548c46e 100644
--- a/src/main/java/com/pahimar/ee3/network/packet/PacketTileUpdate.java
+++ b/src/main/java/com/pahimar/ee3/network/packet/PacketTileUpdate.java
@@ -16,7 +16,6 @@ import java.io.IOException;
  * PacketTileUpdate
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class PacketTileUpdate extends PacketEE
 {
@@ -74,5 +73,4 @@ public class PacketTileUpdate extends PacketEE
 
         EquivalentExchange3.proxy.handleTileEntityPacket(x, y, z, ForgeDirection.getOrientation(orientation), state, customName);
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/proxy/ClientProxy.java b/src/main/java/com/pahimar/ee3/proxy/ClientProxy.java
index b0634251..86481490 100644
--- a/src/main/java/com/pahimar/ee3/proxy/ClientProxy.java
+++ b/src/main/java/com/pahimar/ee3/proxy/ClientProxy.java
@@ -45,7 +45,6 @@ import net.minecraftforge.common.MinecraftForge;
  * ClientProxy
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class ClientProxy extends CommonProxy
 {
@@ -243,5 +242,4 @@ public class ClientProxy extends CommonProxy
             }
         }
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/proxy/CommonProxy.java b/src/main/java/com/pahimar/ee3/proxy/CommonProxy.java
index 1ca1ace0..ec923070 100644
--- a/src/main/java/com/pahimar/ee3/proxy/CommonProxy.java
+++ b/src/main/java/com/pahimar/ee3/proxy/CommonProxy.java
@@ -21,7 +21,6 @@ import net.minecraftforge.common.ForgeDirection;
  * CommonProxy
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class CommonProxy implements IGuiHandler
 {
@@ -166,5 +165,4 @@ public class CommonProxy implements IGuiHandler
 
         return null;
     }
-
 }
diff --git a/src/main/java/com/pahimar/ee3/recipe/RecipesCalcinator.java b/src/main/java/com/pahimar/ee3/recipe/RecipesCalcinator.java
index 9ec7e3df..7b4ba771 100644
--- a/src/main/java/com/pahimar/ee3/recipe/RecipesCalcinator.java
+++ b/src/main/java/com/pahimar/ee3/recipe/RecipesCalcinator.java
@@ -6,9 +6,7 @@ package com.pahimar.ee3.recipe;
  * RecipesCalcinator
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
-public class RecipesCalcinator
-{
+public class RecipesCalcinator {
 
 }
diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java b/src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java
index e5602db4..7d8ae075 100644
--- a/src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java
+++ b/src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java
@@ -15,7 +15,6 @@ import net.minecraft.nbt.NBTTagList;
  * TileAlchemicalChest
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class TileAlchemicalChest extends TileEE implements IInventory
 {
@@ -43,8 +42,7 @@ public class TileAlchemicalChest extends TileEE implements IInventory
     public static final int INVENTORY_SIZE = 13 * 4;
 
     /**
-     * The ItemStacks that hold the items currently being used in the Alchemical
-     * Chest
+     * The ItemStacks that hold the items currently being used in the Alchemical Chest
      */
     private ItemStack[] inventory;
 
@@ -138,8 +136,7 @@ public class TileAlchemicalChest extends TileEE implements IInventory
     }
 
     /**
-     * Called when a client event is received with the event number and
-     * argument, see World.sendClientEvent
+     * Called when a client event is received with the event number and argument, see World.sendClientEvent
      */
     @Override
     public boolean receiveClientEvent(int eventID, int numUsingPlayers)
@@ -173,9 +170,8 @@ public class TileAlchemicalChest extends TileEE implements IInventory
     }
 
     /**
-     * Allows the entity to update its state. Overridden in most subclasses,
-     * e.g. the mob spawner uses this to count ticks and creates a new spawn
-     * inside its implementation.
+     * Allows the entity to update its state. Overridden in most subclasses, e.g. the mob spawner uses this to count
+     * ticks and creates a new spawn inside its implementation.
      */
     @Override
     public void updateEntity()
@@ -270,7 +266,6 @@ public class TileAlchemicalChest extends TileEE implements IInventory
             }
         }
         nbtTagCompound.setTag("Items", tagList);
-
     }
 
     @Override
diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileAludel.java b/src/main/java/com/pahimar/ee3/tileentity/TileAludel.java
index a19f0550..67fa2f03 100644
--- a/src/main/java/com/pahimar/ee3/tileentity/TileAludel.java
+++ b/src/main/java/com/pahimar/ee3/tileentity/TileAludel.java
@@ -16,7 +16,6 @@ import net.minecraft.network.packet.Packet;
  * TileAludel
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class TileAludel extends TileEE implements IInventory
 {
diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java b/src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java
index 00360719..62904b63 100644
--- a/src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java
+++ b/src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java
@@ -12,11 +12,9 @@ import net.minecraft.nbt.NBTTagList;
  * TileCalcinator
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class TileCalcinator extends TileEE implements IInventory
 {
-
     /**
      * The ItemStacks that hold the items currently being used in the Calcinator
      */
@@ -30,7 +28,6 @@ public class TileCalcinator extends TileEE implements IInventory
 
     public TileCalcinator()
     {
-
         inventory = new ItemStack[INVENTORY_SIZE];
     }
 
@@ -50,14 +47,12 @@ public class TileCalcinator extends TileEE implements IInventory
     @Override
     public ItemStack getStackInSlot(int slotIndex)
     {
-
         return inventory[slotIndex];
     }
 
     @Override
     public ItemStack decrStackSize(int slotIndex, int decrementAmount)
     {
-
         ItemStack itemStack = getStackInSlot(slotIndex);
         if (itemStack != null)
         {
diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileEE.java b/src/main/java/com/pahimar/ee3/tileentity/TileEE.java
index 82226d6c..26fdb272 100644
--- a/src/main/java/com/pahimar/ee3/tileentity/TileEE.java
+++ b/src/main/java/com/pahimar/ee3/tileentity/TileEE.java
@@ -15,7 +15,6 @@ import net.minecraftforge.common.ForgeDirection;
  * TileEE
  *
  * @author pahimar
- * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
 public class TileEE extends TileEntity
 {
@@ -135,5 +134,4 @@ public class TileEE extends TileEntity
     {
         return String.format("TileEE Data - xCoord: %d, yCoord: %d, zCoord: %d, customName: '%s', orientation: %s, state: %d\n", xCoord, yCoord, zCoord, customName, orientation, state);
     }
-
 }