Merge branch 'master' of https://github.com/GTNewHorizons/Electro-Magic-Tools

# Conflicts:
#	src/api/java/baubles/api/package-info.java

src/main/java/emt/EMT.java

@@ -14,13 +14,15 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.Side;
 import emt.command.CommandOutputs;
 import emt.init.EMTEntities;
-import emt.init.EMTResearches;
 import emt.init.Registry;
+import emt.init.EMTResearches;
 import emt.network.PacketEMTKeys;
 import emt.proxy.CommonProxy;
 import emt.util.*;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.oredict.OreDictionary;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 

src/main/java/emt/block/BlockBaseContainer.java

@@ -7,6 +7,7 @@ import emt.EMT;
 import emt.tile.TileEntityEMT;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;

src/main/java/emt/block/BlockElectricCloud.java

@@ -1,11 +1,19 @@
 package emt.block;
 
+import java.util.List;
+import java.util.Random;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
 import emt.tile.TileElectricCloud;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.particle.EffectRenderer;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.IIcon;
@@ -13,8 +21,10 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import thaumcraft.client.fx.ParticleEngine;
 import thaumcraft.client.fx.particles.FXSparkle;
-
-import java.util.Random;
+import thaumcraft.client.fx.particles.FXWisp;
+import thaumcraft.common.Thaumcraft;
+import thaumcraft.common.lib.world.ThaumcraftWorldGenerator;
+import thaumcraft.common.tiles.TileNitor;
 
 public class BlockElectricCloud extends BlockBase {
 	public IIcon icon;

src/main/java/emt/block/BlockEssentiaGenerators.java

@@ -17,6 +17,8 @@ import net.minecraft.world.World;
 import java.util.List;
 import java.util.Random;
 
+import org.lwjgl.opengl.GL11;
+
 public class BlockEssentiaGenerators extends BlockBaseContainer {
 
 	public BlockEssentiaGenerators(String name) {

src/main/java/emt/block/BlockMachines.java

@@ -1,11 +1,10 @@
 package emt.block;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import emt.EMT;
-import emt.tile.TileEntityEtherealMacerator;
-import emt.tile.TileEntityIndustrialWandRecharge;
 import ic2.api.item.IC2Items;
+
+import java.util.List;
+import java.util.Random;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,9 +17,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-
-import java.util.List;
-import java.util.Random;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import emt.EMT;
+import emt.tile.TileEntityEtherealMacerator;
+import emt.tile.TileEntityIndustrialWandRecharge;
 
 public class BlockMachines extends BlockBaseContainer {
 

src/main/java/emt/block/BlockPortableNode.java

@@ -5,14 +5,18 @@ import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
 import emt.tile.TileEntityPortableNode;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 import thaumcraft.common.blocks.BlockAiry;
 
+import java.util.List;
 import java.util.Random;
 
 public class BlockPortableNode extends BlockAiry {

src/main/java/emt/block/BlockSolars.java

@@ -3,6 +3,8 @@ package emt.block;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.block.BlockBaseContainer.IconSet;
+import emt.tile.TileEntityEMT;
 import emt.tile.solar.air.TileEntityAirSolar;
 import emt.tile.solar.air.TileEntityDoubleAirSolar;
 import emt.tile.solar.air.TileEntityTripleAirSolar;
@@ -32,6 +34,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import java.util.List;

src/main/java/emt/client/EMTKeys.java

@@ -1,9 +1,16 @@
 package emt.client;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.lwjgl.input.Keyboard;
+
 import cpw.mods.fml.client.registry.ClientRegistry;
 import emt.util.EMTTextHelper;
 import net.minecraft.client.settings.KeyBinding;
-import org.lwjgl.input.Keyboard;
 
 public class EMTKeys {
 	public static KeyBinding keyUnequip;

src/main/java/emt/client/gui/GuiEtherealMacerator.java

@@ -1,15 +1,16 @@
 package emt.client.gui;
 
-import emt.EMT;
-import emt.client.gui.container.ContainerEtheralMacerator;
-import emt.tile.TileEntityEtherealMacerator;
-import emt.util.EMTTextHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
+import emt.EMT;
+import emt.client.gui.container.ContainerEtheralMacerator;
+import emt.tile.TileEntityEtherealMacerator;
+import emt.util.EMTTextHelper;
+
 public class GuiEtherealMacerator extends GuiContainer {
 
 	public GuiEtherealMacerator(InventoryPlayer inventory, TileEntityEtherealMacerator te) {

src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java

@@ -1,15 +1,16 @@
 package emt.client.gui;
 
-import emt.EMT;
-import emt.client.gui.container.ContainerIndustrialWandRecharge;
-import emt.tile.TileEntityIndustrialWandRecharge;
-import emt.util.EMTTextHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
+import emt.EMT;
+import emt.client.gui.container.ContainerIndustrialWandRecharge;
+import emt.tile.TileEntityIndustrialWandRecharge;
+import emt.util.EMTTextHelper;
+
 public class GuiIndustrialWandRecharger extends GuiContainer {
 
 	public GuiIndustrialWandRecharger(InventoryPlayer inventory, TileEntityIndustrialWandRecharge te) {

src/main/java/emt/client/gui/config/EMTGuiConfig.java

@@ -8,12 +8,12 @@ import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.common.config.ConfigElement;
 
+import static emt.util.EMTConfigHandler.*;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import static emt.util.EMTConfigHandler.*;
-
 public class EMTGuiConfig extends GuiConfig {
 
 	public EMTGuiConfig(GuiScreen parentScreen) {

src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java

@@ -6,6 +6,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.FurnaceRecipes;
 
 public class ContainerIndustrialWandRecharge extends Container {
 

src/main/java/emt/client/model/ModelSpecialArmor.java

@@ -2,11 +2,17 @@ package emt.client.model;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBow;
+import net.minecraft.util.MathHelper;
+
+import org.lwjgl.opengl.GL11;
 
 @SideOnly(Side.CLIENT)
 public class ModelSpecialArmor extends ModelBiped {

src/main/java/emt/client/model/ModelWings.java

@@ -1,8 +1,10 @@
 package emt.client.model;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
+import net.minecraft.util.MathHelper;
 
 public class ModelWings extends ModelBiped {
 

src/main/java/emt/client/renderer/RenderLaser.java

@@ -1,7 +1,5 @@
 package emt.client.renderer;
 
-import emt.EMT;
-import emt.entity.EntityLaser;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.entity.Entity;
@@ -9,6 +7,9 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import emt.EMT;
+import emt.entity.EntityLaser;
+
 public class RenderLaser extends Render {
 
 	private static final ResourceLocation laserTexture = new ResourceLocation(EMT.TEXTURE_PATH, "textures/models/lasermodel.png");

src/main/java/emt/client/renderer/RenderShield.java

@@ -1,18 +1,21 @@
 package emt.client.renderer;
 
+import static org.lwjgl.opengl.GL11.*;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
 import emt.EMT;
+import emt.entity.EntityLaser;
 import emt.entity.EntityShield;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-import static org.lwjgl.opengl.GL11.*;
 
 public class RenderShield extends Render {
 	private static final ResourceLocation shieldTexture = new ResourceLocation(EMT.TEXTURE_PATH, "textures/models/shield.png");

src/main/java/emt/command/CommandOutputs.java

@@ -1,7 +1,5 @@
 package emt.command;
 
-import emt.util.EMTEssentiasOutputs;
-import emt.util.EMTTextHelper;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
@@ -15,6 +13,9 @@ import thaumcraft.api.aspects.Aspect;
 import java.util.Collection;
 import java.util.List;
 
+import emt.util.EMTEssentiasOutputs;
+import emt.util.EMTTextHelper;
+
 public class CommandOutputs extends CommandBase {
 
     public String text;

src/main/java/emt/entity/EntityArcher.java

@@ -14,6 +14,7 @@ import net.minecraft.entity.monster.EntitySnowman;
 import net.minecraft.entity.monster.IMob;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/emt/entity/EntityEnergyBall.java

@@ -1,14 +1,23 @@
 package emt.entity;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import emt.util.EMTRandomHelper.Bolt;
+import emt.util.EMTRandomHelper.Point;
 import io.netty.buffer.ByteBuf;
+import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IProjectile;
+import net.minecraft.entity.projectile.EntityFireball;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
@@ -17,8 +26,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import thaumcraft.common.Thaumcraft;
 
-import java.util.ArrayList;
-
 public class EntityEnergyBall extends Entity implements IProjectile, IEntityAdditionalSpawnData {
 	public static final int RADIUS = 8;
 	public static final int MAX_TICKS_IN_TILE = 60;

src/main/java/emt/entity/EntityLaser.java

@@ -1,14 +1,17 @@
 package emt.entity;
 
+import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 import cpw.mods.fml.common.registry.IThrowableEntity;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.IProjectile;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.MathHelper;

src/main/java/emt/entity/EntityShield.java

@@ -1,11 +1,19 @@
 package emt.entity;
 
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import ic2.core.IC2;
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.IEntitySelector;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.IProjectile;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
 public class EntityShield extends Entity {

src/main/java/emt/init/EMTBlocks.java

@@ -1,18 +1,27 @@
 package emt.init;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import emt.block.*;
+import emt.block.BlockElectricCloud;
+import emt.block.BlockEssentiaGenerators;
+import emt.block.BlockMachines;
+import emt.block.BlockPortableNode;
+import emt.block.BlockShield;
+import emt.block.BlockSolars;
 import emt.item.block.ItemBlockElectricCloud;
+import emt.item.block.ItemBlockEssentiaGenerator;
 import emt.item.block.ItemBlockEssentiaGenerators;
 import emt.item.block.ItemBlockMachines;
 import emt.item.block.ItemBlockSolars;
 import ic2.api.item.IC2Items;
 import net.minecraft.block.Block;
+import net.minecraft.block.Block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import static thaumcraft.api.ThaumcraftApi.*;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 
-import static thaumcraft.api.ThaumcraftApi.registerObjectTag;
-
 public class EMTBlocks {
 
 	public static Block portableNode, essentiaGens, shield, emtSolars, emtMachines, emtSolars2, electricCloud;

src/main/java/emt/init/EMTEntities.java

@@ -9,6 +9,7 @@ import emt.entity.EntityShield;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityList.EntityEggInfo;
+import net.minecraft.entity.EntityLiving;
 
 public class EMTEntities {
 

src/main/java/emt/init/EMTItems.java

@@ -1,5 +1,6 @@
 package emt.init;
 
+import ic2.core.init.InternalName;
 import cpw.mods.fml.common.registry.GameRegistry;
 import emt.EMT;
 import emt.item.ItemElectricScribingTools;
@@ -18,7 +19,12 @@ import emt.item.armor.wings.ItemFeatherWing;
 import emt.item.armor.wings.ItemNanoWing;
 import emt.item.armor.wings.ItemQuantumWing;
 import emt.item.armor.wings.ItemThaumiumReinforcedWing;
-import emt.item.focus.*;
+import emt.item.focus.ItemChargeFocus;
+import emt.item.focus.ItemChristmasFocus;
+import emt.item.focus.ItemExplosionFocus;
+import emt.item.focus.ItemEnergyBallFocus;
+import emt.item.focus.ItemShieldFocus;
+import emt.item.focus.ItemWandChargingFocus;
 import emt.item.tool.ItemElectricHoeGrowth;
 import emt.item.tool.ItemElectricThorHammer;
 import emt.item.tool.ItemThorHammer;
@@ -31,7 +37,8 @@ import emt.item.tool.drill.ItemThaumiumDrill;
 import emt.item.tool.omnitool.ItemOmnitoolDiamond;
 import emt.item.tool.omnitool.ItemOmnitoolIron;
 import emt.item.tool.omnitool.ItemOmnitoolThaumium;
-import ic2.core.init.InternalName;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;

src/main/java/emt/init/EMTRecipes.java

@@ -1,36 +1,45 @@
 package emt.init;
 
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
 import emt.EMT;
 import emt.util.EMTConfigHandler;
 import emt.util.EMTCraftingAspects;
 import emt.util.EMTResearchAspects;
+
+import static emt.util.EMTRandomHelper.*;
+import ic2.api.item.ElectricItem;
 import ic2.api.item.IC2Items;
 import ic2.api.recipe.IRecipeInput;
 import ic2.api.recipe.RecipeInputItemStack;
 import ic2.api.recipe.Recipes;
 import ic2.core.BasicMachineRecipeManager;
 import ic2.core.Ic2Items;
+import ic2.core.item.ItemFluidCell;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+import static thaumcraft.api.ThaumcraftApi.*;
+import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.crafting.CrucibleRecipe;
 import thaumcraft.api.crafting.InfusionRecipe;
 import thaumcraft.api.crafting.ShapedArcaneRecipe;
 import thaumcraft.api.crafting.ShapelessArcaneRecipe;
+import thaumcraft.common.blocks.ItemJarFilled;
 import thaumcraft.common.blocks.ItemJarNode;
 import thaumcraft.common.config.ConfigBlocks;
 import thaumcraft.common.config.ConfigItems;
 
 import java.util.Iterator;
 
-import static emt.util.EMTRandomHelper.getChargedItem;
-import static thaumcraft.api.ThaumcraftApi.*;
-
 public class EMTRecipes {
 
 	public static ItemStack uuMCell = new ItemStack(EMTItems.itemEMTItems, 1, 15);

src/main/java/emt/init/EMTResearches.java

@@ -1,13 +1,16 @@
 package emt.init;
 
 import emt.EMT;
+import emt.client.EMTKeys;
 import emt.util.EMTConfigHandler;
 import emt.util.EMTResearchAspects;
 import emt.util.EMTResearchItem;
 import ic2.api.item.IC2Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
+import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.research.ResearchCategories;
+import thaumcraft.api.research.ResearchItem;
 import thaumcraft.api.research.ResearchPage;
 
 public class EMTResearches {

src/main/java/emt/init/EMTTiles.java

@@ -5,7 +5,11 @@ import emt.tile.TileElectricCloud;
 import emt.tile.TileEntityEtherealMacerator;
 import emt.tile.TileEntityIndustrialWandRecharge;
 import emt.tile.TileEntityPortableNode;
-import emt.tile.generator.*;
+import emt.tile.generator.TileEntityAerGenerator;
+import emt.tile.generator.TileEntityArborGenerator;
+import emt.tile.generator.TileEntityAuramGenerator;
+import emt.tile.generator.TileEntityIgnisGenerator;
+import emt.tile.generator.TileEntityPotentiaGenerator;
 import emt.tile.solar.air.TileEntityAirSolar;
 import emt.tile.solar.air.TileEntityDoubleAirSolar;
 import emt.tile.solar.air.TileEntityTripleAirSolar;

src/main/java/emt/item/ItemBase.java

@@ -1,5 +1,6 @@
 package emt.item;
 
+import emt.EMT;
 import emt.EMT;
 import emt.util.EMTTextHelper;
 import net.minecraft.item.Item;

src/main/java/emt/item/ItemMaterials.java

@@ -3,12 +3,14 @@ package emt.item;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.EMT;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.effect.EntityLightningBolt;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -21,6 +23,7 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.ArrowNockEvent;
+import net.minecraftforge.oredict.OreDictionary;
 import thaumcraft.common.config.Config;
 import thaumcraft.common.lib.utils.InventoryUtils;
 

src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java

@@ -4,6 +4,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.EMT;
 import emt.util.EMTConfigHandler;
 import emt.util.EMTTextHelper;
 import ic2.api.item.ElectricItem;

src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java

@@ -1,41 +1,71 @@
 package emt.item.armor.chestplate;
 
+import cpw.mods.fml.common.eventhandler.EventBus;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.EMT;
 import emt.client.model.ModelSpecialArmor;
+import emt.client.model.ModelWings;
 import emt.init.EMTItems;
+import emt.item.armor.wings.ItemNanoWing;
+import emt.item.armor.wings.ItemQuantumWing;
 import emt.util.EMTConfigHandler;
+import emt.util.EMTRandomHelper;
+import emt.util.EMTTextHelper;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IC2Items;
+import ic2.api.item.IElectricItemManager;
 import ic2.core.IC2;
+import ic2.core.IC2Achievements;
+import ic2.core.IC2Potion;
+import ic2.core.Ic2Items;
+import ic2.core.Platform;
+import ic2.core.audio.AudioManager;
 import ic2.core.audio.AudioSource;
 import ic2.core.audio.PositionSpec;
 import ic2.core.init.InternalName;
+import ic2.core.init.MainConfig;
+import ic2.core.item.ItemTinCan;
 import ic2.core.item.armor.ItemArmorElectric;
+import ic2.core.util.ConfigUtil;
+import ic2.core.util.Keyboard;
 import ic2.core.util.StackUtil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.FoodStats;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
+import net.minecraftforge.common.ISpecialArmor;
+import net.minecraftforge.common.ISpecialArmor.ArmorProperties;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.LivingFallEvent;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 public class ItemInfusedQuantumChestplate extends ItemArmorElectric {
 
 	public final byte NONE = 0;

src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java

@@ -3,6 +3,7 @@ package emt.item.armor.goggles;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.EMT;
 import emt.util.EMTConfigHandler;
 import emt.util.EMTTextHelper;
 import ic2.api.item.ElectricItem;

src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java

@@ -3,6 +3,7 @@ package emt.item.armor.goggles;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.EMT;
 import emt.util.EMTConfigHandler;
 import ic2.api.item.ElectricItem;
 import net.minecraft.client.renderer.texture.IIconRegister;

src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java

@@ -3,6 +3,7 @@ package emt.item.armor.goggles;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.EMT;
 import emt.util.EMTConfigHandler;
 import ic2.api.item.ElectricItem;
 import net.minecraft.client.renderer.texture.IIconRegister;

src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java

@@ -3,6 +3,7 @@ package emt.item.armor.goggles;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.EMT;
 import emt.util.EMTConfigHandler;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;

src/main/java/emt/item/armor/wings/ItemFeatherWing.java

@@ -1,13 +1,17 @@
 package emt.item.armor.wings;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import emt.EMT;
-import emt.client.model.ModelWings;
-import emt.util.EMTConfigHandler;
+import java.util.Random;
+
 import ic2.api.item.ElectricItem;
 import ic2.core.IC2;
 import ic2.core.util.StackUtil;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import emt.EMT;
+import emt.EMT;
+import emt.client.model.ModelWings;
+import emt.util.EMTConfigHandler;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -16,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
 public class ItemFeatherWing extends ItemArmor {

src/main/java/emt/item/armor/wings/ItemNanoWing.java

@@ -3,10 +3,13 @@ package emt.item.armor.wings;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.EMT;
+import emt.item.armor.wings.ItemThaumiumReinforcedWing;
 import emt.util.EMTConfigHandler;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.api.item.IMetalArmor;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;

src/main/java/emt/item/armor/wings/ItemQuantumWing.java

@@ -3,10 +3,15 @@ package emt.item.armor.wings;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.util.EMTConfigHandler;
+import ic2.api.item.ElectricItem;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
 
 public class ItemQuantumWing extends ItemNanoWing {

src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java

@@ -3,15 +3,21 @@ package emt.item.armor.wings;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.EMT;
+import emt.util.EMTConfigHandler;
 import emt.util.EMTTextHelper;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import thaumcraft.api.IRepairable;
 import thaumcraft.api.IVisDiscountGear;
 import thaumcraft.api.aspects.Aspect;
+import ic2.core.IC2;
+import ic2.core.util.StackUtil;
 
 import java.util.List;
 

src/main/java/emt/item/block/ItemBlockElectricCloud.java

@@ -4,6 +4,7 @@ import emt.EMT;
 import emt.util.EMTTextHelper;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;

src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java

@@ -1,7 +1,11 @@
 package emt.item.block;
 
 import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+
+import java.util.List;
 
 public class ItemBlockEssentiaGenerator extends ItemBlock {
 

src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java

@@ -1,9 +1,19 @@
 package emt.item.block;
 
 import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
+import java.util.List;
+
+import emt.tile.generator.TileEntityAerGenerator;
+import emt.tile.generator.TileEntityArborGenerator;
+import emt.tile.generator.TileEntityAuramGenerator;
+import emt.tile.generator.TileEntityIgnisGenerator;
+import emt.tile.generator.TileEntityPotentiaGenerator;
+import emt.util.EMTConfigHandler;
+
 public class ItemBlockEssentiaGenerators extends ItemBlock {
 
 	public ItemBlockEssentiaGenerators(Block id) {

src/main/java/emt/item/block/ItemBlockSolars.java

@@ -1,16 +1,18 @@
 package emt.item.block;
 
-import emt.block.BlockBaseContainer;
-import emt.util.EMTConfigHandler;
-import emt.util.EMTTextHelper;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
+import static emt.util.EMTTextHelper.localize;
+
 import java.util.List;
 
-import static emt.util.EMTTextHelper.localize;
+import emt.block.BlockBaseContainer;
+import emt.block.BlockSolars;
+import emt.util.EMTConfigHandler;
+import emt.util.EMTTextHelper;
 
 public class ItemBlockSolars extends ItemBlock {
 

src/main/java/emt/item/focus/ItemBaseFocus.java

@@ -1,11 +1,9 @@
 package emt.item.focus;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import emt.EMT;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
@@ -13,10 +11,15 @@ import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.wands.IWandFocus;
 import thaumcraft.api.wands.ItemFocusBasic;
 
 import java.util.List;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import emt.EMT;
+
 public abstract class ItemBaseFocus extends ItemFocusBasic {
 
 	public IIcon ornament;

src/main/java/emt/item/focus/ItemChargeFocus.java

@@ -1,8 +1,11 @@
 package emt.item.focus;
 
-import emt.util.EMTConfigHandler;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
+
+import java.util.Map.Entry;
+
+import emt.util.EMTConfigHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
@@ -12,8 +15,6 @@ import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.wands.FocusUpgradeType;
 import thaumcraft.common.items.wands.ItemWandCasting;
 
-import java.util.Map.Entry;
-
 public class ItemChargeFocus extends ItemBaseFocus {
 
 	private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10);

src/main/java/emt/item/focus/ItemChristmasFocus.java

@@ -1,12 +1,18 @@
 package emt.item.focus;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import emt.EMT;
+import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.monster.EntitySnowman;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.wands.ItemFocusBasic;
 import thaumcraft.common.items.wands.ItemWandCasting;
 
 public class ItemChristmasFocus extends ItemBaseFocus {

src/main/java/emt/item/focus/ItemEnergyBallFocus.java

@@ -2,11 +2,18 @@ package emt.item.focus;
 
 import emt.entity.EntityEnergyBall;
 import ic2.api.item.ElectricItem;
+import ic2.core.item.armor.ItemArmorElectric;
+import ic2.core.item.armor.ItemArmorIC2;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.projectile.EntityLargeFireball;
+import net.minecraft.entity.projectile.EntitySmallFireball;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.wands.ItemFocusBasic;
 
 public class ItemEnergyBallFocus extends ItemBaseFocus {
 

src/main/java/emt/item/focus/ItemExplosionFocus.java

@@ -3,6 +3,8 @@ package emt.item.focus;
 import emt.entity.EntityLaser;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.IIcon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import thaumcraft.api.aspects.Aspect;

src/main/java/emt/item/focus/ItemShieldFocus.java

@@ -1,18 +1,28 @@
 package emt.item.focus;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import emt.EMT;
 import emt.entity.EntityShield;
+import emt.init.EMTBlocks;
 import ic2.core.IC2;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.common.items.wands.ItemWandCasting;
 
-import java.util.LinkedList;
-
 public class ItemShieldFocus extends ItemBaseFocus {
 	private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 5).add(Aspect.WATER, 5).add(Aspect.AIR, 5);
 

src/main/java/emt/item/focus/ItemWandChargingFocus.java

@@ -1,5 +1,8 @@
 package emt.item.focus;
 
+import java.util.Map.Entry;
+
+import emt.item.focus.ItemBaseFocus;
 import emt.util.EMTConfigHandler;
 import ic2.api.item.ElectricItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -9,8 +12,6 @@ import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.wands.FocusUpgradeType;
 import thaumcraft.common.items.wands.ItemWandCasting;
 
-import java.util.Map.Entry;
-
 public class ItemWandChargingFocus extends ItemBaseFocus {
 
 	AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10);

src/main/java/emt/item/tool/ItemElectricHoeGrowth.java

@@ -8,6 +8,7 @@ import ic2.api.item.IElectricItem;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemHoe;
@@ -17,6 +18,7 @@ import net.minecraft.world.World;
 import thaumcraft.common.Thaumcraft;
 import thaumcraft.common.blocks.BlockCustomPlant;
 import thaumcraft.common.config.ConfigBlocks;
+import thaumcraft.common.items.equipment.ItemElementalHoe;
 import thaumcraft.common.lib.utils.Utils;
 
 import java.util.List;

src/main/java/emt/item/tool/ItemThorHammerBroken.java

@@ -8,10 +8,13 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Item.ToolMaterial;
 import net.minecraft.item.ItemSword;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.World;
+
 import org.lwjgl.input.Keyboard;
+
 import thaumcraft.api.IRepairable;
 import thaumcraft.common.entities.projectile.EntityAlumentum;
 

src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java

@@ -7,9 +7,12 @@ import emt.util.EMTConfigHandler;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import ic2.core.IC2;
+import ic2.core.audio.AudioSource;
+import ic2.core.audio.PositionSpec;
 import ic2.core.util.StackUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockTorch;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.enchantment.Enchantment;
@@ -32,6 +35,7 @@ import net.minecraftforge.event.ForgeEventFactory;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Random;
 
 public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {

src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java

@@ -5,8 +5,13 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
 import ic2.api.item.ElectricItem;
+import ic2.core.IC2;
+import ic2.core.audio.AudioSource;
+import ic2.core.audio.PositionSpec;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;

src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java

@@ -4,8 +4,12 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
 import ic2.api.item.ElectricItem;
+import ic2.core.IC2;
+import ic2.core.audio.AudioSource;
+import ic2.core.audio.PositionSpec;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java

@@ -4,12 +4,14 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
 import emt.util.EMTConfigHandler;
+import emt.util.EMTRandomHelper;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemPickaxe;

src/main/java/emt/network/PacketEMTKeys.java

@@ -1,10 +1,12 @@
 package emt.network;
 
+import io.netty.buffer.ByteBuf;
+import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import emt.init.EMTItems;
-import io.netty.buffer.ByteBuf;
 
 public class PacketEMTKeys implements IMessage, IMessageHandler<PacketEMTKeys, IMessage> {
 

src/main/java/emt/proxy/ClientProxy.java

@@ -1,5 +1,15 @@
 package emt.proxy;
 
+import org.lwjgl.input.Keyboard;
+
+import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.renderer.entity.RenderFireball;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.entity.RenderSnowMan;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import emt.client.EMTKeys;
 import emt.client.renderer.RenderLaser;
@@ -8,10 +18,6 @@ import emt.entity.EntityArcher;
 import emt.entity.EntityEnergyBall;
 import emt.entity.EntityLaser;
 import emt.entity.EntityShield;
-import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.renderer.entity.RenderSnowMan;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.ResourceLocation;
 
 public class ClientProxy extends CommonProxy {
 

src/main/java/emt/tile/TileEntityEtherealMacerator.java

@@ -1,6 +1,7 @@
 package emt.tile;
 
 import emt.init.EMTBlocks;
+import emt.tile.TileEntityEMT;
 import emt.util.EMTConfigHandler;
 import ic2.api.item.IC2Items;
 import ic2.api.tile.IWrenchable;

src/main/java/emt/tile/generator/TileEntityAerGenerator.java

@@ -1,5 +1,6 @@
 package emt.tile.generator;
 
+import emt.util.EMTConfigHandler;
 import emt.util.EMTEssentiasOutputs;
 import thaumcraft.api.aspects.Aspect;
 

src/main/java/emt/tile/generator/TileEntityArborGenerator.java

@@ -1,5 +1,6 @@
 package emt.tile.generator;
 
+import emt.util.EMTConfigHandler;
 import emt.util.EMTEssentiasOutputs;
 import thaumcraft.api.aspects.Aspect;
 

src/main/java/emt/tile/generator/TileEntityAuramGenerator.java

@@ -1,5 +1,6 @@
 package emt.tile.generator;
 
+import emt.util.EMTConfigHandler;
 import emt.util.EMTEssentiasOutputs;
 import thaumcraft.api.aspects.Aspect;
 

src/main/java/emt/tile/generator/TileEntityBaseGenerator.java

@@ -1,16 +1,20 @@
 package emt.tile.generator;
 
+import java.util.Random;
+
 import emt.tile.TileEntityEMT;
+import emt.util.EMTConfigHandler;
 import ic2.api.energy.prefab.BasicSource;
+import net.minecraft.client.particle.EntitySmokeFX;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.IAspectSource;
+import thaumcraft.common.lib.events.EssentiaHandler;
 import thaumcraft.common.lib.network.PacketHandler;
 import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource;
 
-import java.util.Random;
-
 public abstract class TileEntityBaseGenerator extends TileEntityEMT {
 
 	public BasicSource energySource = new BasicSource(this, 1000000000, 3);

src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java

@@ -1,5 +1,6 @@
 package emt.tile.generator;
 
+import emt.util.EMTConfigHandler;
 import emt.util.EMTEssentiasOutputs;
 import thaumcraft.api.aspects.Aspect;
 

src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java

@@ -1,6 +1,8 @@
 package emt.tile.generator;
 
+import emt.util.EMTConfigHandler;
 import emt.util.EMTEssentiasOutputs;
+import ic2.api.energy.prefab.BasicSource;
 import thaumcraft.api.aspects.Aspect;
 
 public class TileEntityPotentiaGenerator extends TileEntityBaseGenerator {

src/main/java/emt/tile/solar/TileEntitySolarBase.java

@@ -1,6 +1,5 @@
 package emt.tile.solar;
 
-import emt.tile.TileEntityEMT;
 import ic2.api.energy.prefab.BasicSource;
 import ic2.api.tile.IWrenchable;
 import net.minecraft.entity.player.EntityPlayer;
@@ -8,6 +7,8 @@ import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.Random;
 
+import emt.tile.TileEntityEMT;
+
 public abstract class TileEntitySolarBase extends TileEntityEMT implements IWrenchable {
 
 	public BasicSource energySource;

src/main/java/emt/util/EMTClientEventHandler.java

@@ -8,9 +8,12 @@ import emt.EMT;
 import emt.client.EMTKeys;
 import emt.init.EMTItems;
 import emt.network.PacketEMTKeys;
+import ic2.api.item.IC2Items;
 import ic2.core.IC2;
+import ic2.core.Ic2Items;
 import ic2.core.audio.AudioSource;
 import ic2.core.audio.PositionSpec;
+import ic2.core.item.tool.ItemElectricToolChainsaw;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;

src/main/java/emt/util/EMTCreativeTab.java

@@ -1,8 +1,10 @@
 package emt.util;
 
+import emt.init.EMTBlocks;
 import emt.init.EMTItems;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 
 public class EMTCreativeTab extends CreativeTabs {
 

src/main/java/emt/util/EMTEventHandler.java

@@ -1,27 +1,41 @@
 package emt.util;
 
+import java.util.Random;
+
 import baubles.api.BaublesApi;
 import cpw.mods.fml.client.event.ConfigChangedEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.PlayerEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
+import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
+import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent;
 import emt.EMT;
+import emt.client.EMTKeys;
 import emt.init.EMTBlocks;
 import emt.init.EMTItems;
 import emt.item.armor.wings.ItemFeatherWing;
+import emt.network.PacketEMTKeys;
+import emt.proxy.ClientProxy;
 import ic2.api.item.ElectricItem;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.monster.EntityCreeper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
+import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
+import net.minecraftforge.event.entity.living.LivingFallEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
 import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import thaumcraft.common.config.ConfigBlocks;
+import thaumcraft.common.config.ConfigItems;
 import thaumcraft.common.entities.monster.EntityTaintChicken;
 
 public class EMTEventHandler {

src/main/java/emt/util/EMTRandomHelper.java

@@ -1,10 +1,19 @@
 package emt.util;
 
 import ic2.api.item.ElectricItem;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.event.ForgeEventFactory;
 
 import java.util.ArrayList;
+import java.util.Locale;
 import java.util.Random;
 
 public class EMTRandomHelper {