Cleaning up some imports and formatting

ee3_common/com/pahimar/ee3/EquivalentExchange3.java

@@ -38,13 +38,7 @@ import com.pahimar.ee3.network.PacketHandler;
 
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.FingerprintWarning;
-import cpw.mods.fml.common.Mod.IMCCallback;
-import cpw.mods.fml.common.Mod.Init;
 import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.Mod.PostInit;
-import cpw.mods.fml.common.Mod.PreInit;
-import cpw.mods.fml.common.Mod.ServerStarting;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLFingerprintViolationEvent;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -78,12 +72,14 @@ public class EquivalentExchange3 {
 	@SidedProxy(clientSide = Reference.CLIENT_PROXY_CLASS, serverSide = Reference.SERVER_PROXY_CLASS)
 	public static CommonProxy proxy;
 
-    public static CreativeTabs tabsEE3 = new CreativeTabEE3(CreativeTabs.getNextID(), Reference.MOD_ID);
+	public static CreativeTabs tabsEE3 = new CreativeTabEE3(
+			CreativeTabs.getNextID(), Reference.MOD_ID);
 
 	@EventHandler
 	public void invalidFingerprint(FMLFingerprintViolationEvent event) {
 
-        // Report (log) to the user that the version of Equivalent Exchange 3 they are using has been changed/tampered with
+		// Report (log) to the user that the version of Equivalent Exchange 3
+		// they are using has been changed/tampered with
 		LogHelper.severe(Strings.INVALID_FINGERPRINT_MESSAGE);
 	}
 
@@ -104,13 +100,18 @@ public class EquivalentExchange3 {
 		LocalizationHandler.loadLanguages();
 
 		// Initialize the configuration
-        ConfigurationHandler.init(new File(event.getModConfigurationDirectory().getAbsolutePath() + File.separator + Reference.CHANNEL_NAME + File.separator + Reference.MOD_ID + ".cfg"));
+		ConfigurationHandler.init(new File(event.getModConfigurationDirectory()
+				.getAbsolutePath()
+				+ File.separator
+				+ Reference.CHANNEL_NAME
+				+ File.separator + Reference.MOD_ID + ".cfg"));
 
 		// Conduct the version check and log the result
 		VersionHelper.execute();
 
 		// Initialize the Version Check Tick Handler (Client only)
-        TickRegistry.registerTickHandler(new VersionCheckTickHandler(), Side.CLIENT);
+		TickRegistry.registerTickHandler(new VersionCheckTickHandler(),
+				Side.CLIENT);
 
 		// Initialize the Render Tick Handler (Client only)
 		proxy.registerRenderTickHandler();
@@ -160,14 +161,24 @@ public class EquivalentExchange3 {
 		proxy.initRenderingAndTextures();
 
 		// Add in the ability to dye Alchemical Bags
-        CraftingManager.getInstance().getRecipeList().add(new RecipesAlchemicalBagDyes());
+		CraftingManager.getInstance().getRecipeList()
+				.add(new RecipesAlchemicalBagDyes());
 
 		// Register the Fuel Handler
 		GameRegistry.registerFuelHandler(new FuelHandler());
 
-        // Quick test to see that sending an encoded recipe to be added to the recipe registry works
+		// Quick test to see that sending an encoded recipe to be added to the
-        FMLInterModComms.sendMessage(Reference.MOD_ID, InterModComms.ADD_RECIPE, NBTHelper.encodeRecipeAsNBT(Item.bucketWater, Arrays.asList(Item.bucketEmpty, Block.waterStill)));
+		// recipe registry works
-        FMLInterModComms.sendMessage(Reference.MOD_ID, InterModComms.ADD_RECIPE, NBTHelper.encodeRecipeAsNBT(Item.bucketLava, Arrays.asList(Item.bucketEmpty, Block.lavaStill)));
+		FMLInterModComms.sendMessage(
+				Reference.MOD_ID,
+				InterModComms.ADD_RECIPE,
+				NBTHelper.encodeRecipeAsNBT(Item.bucketWater,
+						Arrays.asList(Item.bucketEmpty, Block.waterStill)));
+		FMLInterModComms.sendMessage(
+				Reference.MOD_ID,
+				InterModComms.ADD_RECIPE,
+				NBTHelper.encodeRecipeAsNBT(Item.bucketLava,
+						Arrays.asList(Item.bucketEmpty, Block.lavaStill)));
 	}
 
 	@EventHandler
@@ -177,7 +188,8 @@ public class EquivalentExchange3 {
 		AddonHandler.init();
 
 		// Initialize the DynEMC system
-        // TODO Seems like this happens earlier than it should now, investigate where this should go
+		// TODO Seems like this happens earlier than it should now, investigate
+		// where this should go
 		DynEMC dynEMC = DynEMC.getInstance();
 	}
 

ee3_common/com/pahimar/ee3/client/audio/SoundHandler.java

@@ -4,7 +4,6 @@ import net.minecraftforge.client.event.sound.SoundLoadEvent;
 import net.minecraftforge.event.ForgeSubscribe;
 
 import com.pahimar.ee3.core.util.LogHelper;
-import com.pahimar.ee3.lib.Reference;
 import com.pahimar.ee3.lib.Sounds;
 
 /**

ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java

@@ -3,12 +3,10 @@ package com.pahimar.ee3.client.gui.inventory;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.inventory.ContainerAlchemicalBag;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.lib.Textures;
@@ -39,8 +37,12 @@ public class GuiAlchemicalBag extends GuiContainer {
 	@Override
 	protected void drawGuiContainerForegroundLayer(int x, int y) {
 
-        fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_ALCHEMICAL_BAG_NAME), 8, 6, 4210752);
+		fontRenderer.drawString(StatCollector
-        fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY), 44, ySize - 96 + 2, 4210752);
+				.translateToLocal(Strings.CONTAINER_ALCHEMICAL_BAG_NAME), 8, 6,
+				4210752);
+		fontRenderer.drawString(
+				StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY),
+				44, ySize - 96 + 2, 4210752);
 	}
 
 	@Override
@@ -64,8 +66,10 @@ public class GuiAlchemicalBag extends GuiContainer {
 		if (mc.thePlayer != null) {
 			for (ItemStack itemStack : mc.thePlayer.inventory.mainInventory) {
 				if (itemStack != null) {
-                    if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) {
+					if (NBTHelper.hasTag(itemStack,
-                        NBTHelper.removeTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN);
+							Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) {
+						NBTHelper.removeTag(itemStack,
+								Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN);
 					}
 				}
 			}

ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java

@@ -2,12 +2,10 @@ package com.pahimar.ee3.client.gui.inventory;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.inventory.ContainerAlchemicalChest;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.lib.Textures;

ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java

@@ -2,12 +2,10 @@ package com.pahimar.ee3.client.gui.inventory;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.inventory.ContainerAludel;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.lib.Textures;

ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java

@@ -2,12 +2,10 @@ package com.pahimar.ee3.client.gui.inventory;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.inventory.ContainerCalcinator;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.lib.Textures;

ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java

@@ -2,12 +2,10 @@ package com.pahimar.ee3.client.gui.inventory;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.inventory.ContainerGlassBell;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.lib.Textures;

ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java

@@ -3,13 +3,11 @@ package com.pahimar.ee3.client.gui.inventory;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.inventory.ContainerPortableCrafting;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.lib.Textures;

ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java

@@ -3,11 +3,8 @@ package com.pahimar.ee3.client.gui.inventory;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-
 import org.lwjgl.opengl.GL11;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.lib.Strings;
 import com.pahimar.ee3.lib.Textures;
 import com.pahimar.ee3.nbt.NBTHelper;

ee3_common/com/pahimar/ee3/client/renderer/RenderUtils.java

@@ -4,7 +4,6 @@ import net.minecraft.block.Block;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;

ee3_common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java

@@ -2,13 +2,10 @@ package com.pahimar.ee3.client.renderer.item;
 
 import net.minecraft.client.model.ModelChest;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
-import com.pahimar.ee3.lib.Reference;
 import com.pahimar.ee3.lib.Textures;
 
 import cpw.mods.fml.client.FMLClientHandler;

ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java

@@ -1,14 +1,11 @@
 package com.pahimar.ee3.client.renderer.item;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
 import com.pahimar.ee3.client.model.ModelAludel;
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
-import com.pahimar.ee3.lib.Reference;
 import com.pahimar.ee3.lib.Textures;
 
 import cpw.mods.fml.client.FMLClientHandler;

ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java

@@ -1,13 +1,11 @@
 package com.pahimar.ee3.client.renderer.item;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
 import com.pahimar.ee3.client.model.ModelCalcinator;
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.lib.Textures;
 
 import cpw.mods.fml.client.FMLClientHandler;

ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java

@@ -1,13 +1,11 @@
 package com.pahimar.ee3.client.renderer.item;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
 import com.pahimar.ee3.client.model.ModelGlassBell;
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.lib.Textures;
 
 import cpw.mods.fml.client.FMLClientHandler;

ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java

@@ -3,14 +3,11 @@ package com.pahimar.ee3.client.renderer.tileentity;
 import net.minecraft.client.model.ModelChest;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
-import com.pahimar.ee3.lib.Reference;
 import com.pahimar.ee3.lib.Textures;
 import com.pahimar.ee3.tileentity.TileAlchemicalChest;
 

ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java

@@ -7,13 +7,11 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
 import com.pahimar.ee3.client.model.ModelAludel;
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.lib.Textures;
 import com.pahimar.ee3.tileentity.TileAludel;
 import com.pahimar.ee3.tileentity.TileGlassBell;

ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java

@@ -2,12 +2,9 @@ package com.pahimar.ee3.client.renderer.tileentity;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
-
 import org.lwjgl.opengl.GL11;
 
 import com.pahimar.ee3.client.model.ModelCalcinator;
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.lib.Textures;
 import com.pahimar.ee3.tileentity.TileCalcinator;
 

ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java

@@ -7,13 +7,11 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
 import com.pahimar.ee3.client.model.ModelGlassBell;
-import com.pahimar.ee3.core.util.ResourceLocationHelper;
 import com.pahimar.ee3.lib.Textures;
 import com.pahimar.ee3.tileentity.TileGlassBell;
 

ee3_common/com/pahimar/ee3/command/CommandOverlay.java

@@ -7,7 +7,6 @@ import net.minecraft.util.ChatMessageComponent;
 import com.pahimar.ee3.configuration.ConfigurationHandler;
 import com.pahimar.ee3.configuration.ConfigurationSettings;
 import com.pahimar.ee3.core.util.LocalizationUtil;
-import com.pahimar.ee3.lib.Colours;
 import com.pahimar.ee3.lib.Commands;
 import com.pahimar.ee3.lib.Strings;
 

ee3_common/com/pahimar/ee3/command/CommandParticles.java

@@ -6,8 +6,6 @@ import net.minecraft.util.ChatMessageComponent;
 
 import com.pahimar.ee3.configuration.ConfigurationHandler;
 import com.pahimar.ee3.configuration.ConfigurationSettings;
-import com.pahimar.ee3.core.util.LocalizationUtil;
-import com.pahimar.ee3.lib.Colours;
 import com.pahimar.ee3.lib.Commands;
 import com.pahimar.ee3.lib.Strings;
 

ee3_common/com/pahimar/ee3/command/CommandSounds.java

@@ -6,8 +6,6 @@ import net.minecraft.util.ChatMessageComponent;
 
 import com.pahimar.ee3.configuration.ConfigurationHandler;
 import com.pahimar.ee3.configuration.ConfigurationSettings;
-import com.pahimar.ee3.core.util.LocalizationUtil;
-import com.pahimar.ee3.lib.Colours;
 import com.pahimar.ee3.lib.Commands;
 
 /**