Organize imports

src/main/java/appeng/core/AELog.java

@@ -20,10 +20,11 @@ package appeng.core;
 
 import org.apache.logging.log4j.Level;
 
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+
 import appeng.core.features.AEFeature;
 import appeng.tile.AEBaseTile;
 import appeng.util.Platform;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
 
 public class AELog
 {

src/main/java/appeng/core/Api.java

@@ -19,6 +19,7 @@
 package appeng.core;
 
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.IAppEngApi;
 import appeng.api.definitions.Blocks;
 import appeng.api.definitions.Items;

src/main/java/appeng/core/AppEng.java

@@ -22,6 +22,8 @@ package appeng.core;
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
+import com.google.common.base.Stopwatch;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -35,8 +37,6 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 
-import com.google.common.base.Stopwatch;
-
 import appeng.core.crash.CrashEnhancement;
 import appeng.core.crash.CrashInfo;
 import appeng.core.features.AEFeature;

src/main/java/appeng/core/CommonHelper.java

@@ -25,11 +25,13 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
+
+import cpw.mods.fml.common.SidedProxy;
+
 import appeng.api.parts.CableRenderMode;
 import appeng.block.AEBaseBlock;
 import appeng.client.EffectType;
 import appeng.core.sync.AppEngPacket;
-import cpw.mods.fml.common.SidedProxy;
 
 public abstract class CommonHelper
 {

src/main/java/appeng/core/CreativeTabFacade.java

@@ -21,6 +21,7 @@ package appeng.core;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.AEApi;
 import appeng.items.parts.ItemFacade;
 

src/main/java/appeng/core/FacadeConfig.java

@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
 
 import net.minecraft.block.Block;
 import net.minecraftforge.common.config.Configuration;
+
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
 

src/main/java/appeng/core/PlayerMappings.java

@@ -22,12 +22,12 @@ package appeng.core;
 import java.util.Map;
 import java.util.UUID;
 
+import com.google.common.base.Optional;
+
 import net.minecraftforge.common.config.ConfigCategory;
 
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
 
-import com.google.common.base.Optional;
-
 
 /**
  * Wrapper class for the player mappings.

src/main/java/appeng/core/Registration.java

@@ -21,6 +21,10 @@ package appeng.core;
 
 import java.lang.reflect.Field;
 
+import com.google.common.base.Optional;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraft.world.biome.BiomeGenBase;
@@ -37,10 +41,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.VillagerRegistry;
 
-import com.google.common.base.Optional;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-
 import appeng.api.AEApi;
 import appeng.api.IAppEngApi;
 import appeng.api.config.Upgrades;

src/main/java/appeng/core/WorldSettings.java

@@ -32,6 +32,9 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.WeakHashMap;
 
+import com.google.common.base.Optional;
+import com.mojang.authlib.GameProfile;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
@@ -41,9 +44,6 @@ import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
-import com.google.common.base.Optional;
-import com.mojang.authlib.GameProfile;
-
 import appeng.api.util.WorldCoord;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketNewStorageDimension;

src/main/java/appeng/core/api/ApiPart.java

@@ -27,6 +27,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.base.Joiner;
+
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.commons.Remapper;
@@ -43,8 +45,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 
-import com.google.common.base.Joiner;
-
 import appeng.api.parts.CableRenderMode;
 import appeng.api.parts.IPartHelper;
 import appeng.api.parts.IPartItem;

src/main/java/appeng/core/api/ApiStorage.java

@@ -18,13 +18,14 @@
 
 package appeng.core.api;
 
-import io.netty.buffer.ByteBuf;
-
 import java.io.IOException;
 
+import io.netty.buffer.ByteBuf;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
+
 import appeng.api.networking.crafting.ICraftingLink;
 import appeng.api.networking.crafting.ICraftingRequester;
 import appeng.api.networking.energy.IEnergySource;

src/main/java/appeng/core/api/imc/IMCBlackListSpatial.java

@@ -20,10 +20,12 @@ package appeng.core.api.imc;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
+
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+
 import appeng.api.AEApi;
 import appeng.core.AELog;
 import appeng.core.api.IIMCProcessor;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
 
 public class IMCBlackListSpatial implements IIMCProcessor
 {

src/main/java/appeng/core/api/imc/IMCGrinder.java

@@ -53,9 +53,11 @@ package appeng.core.api.imc;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+
 import appeng.api.AEApi;
 import appeng.core.api.IIMCProcessor;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
 
 public class IMCGrinder implements IIMCProcessor
 {

src/main/java/appeng/core/api/imc/IMCMatterCannon.java

@@ -32,9 +32,11 @@ package appeng.core.api.imc;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+
 import appeng.api.AEApi;
 import appeng.core.api.IIMCProcessor;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
 
 public class IMCMatterCannon implements IIMCProcessor
 {

src/main/java/appeng/core/api/imc/IMCP2PAttunement.java

@@ -29,10 +29,12 @@ FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-item",
 package appeng.core.api.imc;
 
 import net.minecraft.item.ItemStack;
+
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+
 import appeng.api.AEApi;
 import appeng.api.config.TunnelType;
 import appeng.core.api.IIMCProcessor;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
 
 public class IMCP2PAttunement implements IIMCProcessor
 {

src/main/java/appeng/core/api/imc/IMCSpatial.java

@@ -23,10 +23,11 @@ FMLInterModComms.sendMessage( "appliedenergistics2", "whitelist-spatial", "mymod
  */
 package appeng.core.api.imc;
 
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+
 import appeng.api.AEApi;
 import appeng.core.AELog;
 import appeng.core.api.IIMCProcessor;
-import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
 
 public class IMCSpatial implements IIMCProcessor
 {

src/main/java/appeng/core/features/ColoredItemDefinition.java

@@ -22,6 +22,7 @@ import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+
 import appeng.api.util.AEColor;
 import appeng.api.util.AEColoredItemDefinition;
 

src/main/java/appeng/core/features/DamagedItemDefinition.java

@@ -23,6 +23,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
+
 import appeng.api.util.AEItemDefinition;
 
 public class DamagedItemDefinition implements AEItemDefinition

src/main/java/appeng/core/features/MaterialStackSrc.java

@@ -20,6 +20,7 @@ package appeng.core.features;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+
 import appeng.items.materials.MaterialType;
 
 public class MaterialStackSrc implements IStackSrc

src/main/java/appeng/core/features/NullItemDefinition.java

@@ -23,6 +23,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
+
 import appeng.api.util.AEItemDefinition;
 
 public class NullItemDefinition implements AEItemDefinition

src/main/java/appeng/core/features/WrappedDamageItemDefinition.java

@@ -23,6 +23,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
+
 import appeng.api.util.AEItemDefinition;
 
 public class WrappedDamageItemDefinition implements AEItemDefinition

src/main/java/appeng/core/features/registries/CellRegistry.java

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.storage.ICellHandler;
 import appeng.api.storage.ICellRegistry;
 import appeng.api.storage.IMEInventoryHandler;

src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java

@@ -23,6 +23,7 @@ import java.util.List;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IExternalStorageHandler;
 import appeng.api.storage.IExternalStorageRegistry;

src/main/java/appeng/core/features/registries/GrinderRecipeManager.java

@@ -27,6 +27,7 @@ import java.util.Map.Entry;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.features.IGrinderEntry;
 import appeng.api.features.IGrinderRegistry;
 import appeng.core.AEConfig;

src/main/java/appeng/core/features/registries/LocatableRegistry.java

@@ -21,12 +21,14 @@ package appeng.core.features.registries;
 import java.util.HashMap;
 
 import net.minecraftforge.common.MinecraftForge;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
 import appeng.api.events.LocatableEventAnnounce;
 import appeng.api.events.LocatableEventAnnounce.LocatableEvent;
 import appeng.api.features.ILocatable;
 import appeng.api.features.ILocatableRegistry;
 import appeng.util.Platform;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class LocatableRegistry implements ILocatableRegistry
 {

src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java

@@ -22,6 +22,7 @@ import java.util.HashMap;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.features.IMatterCannonAmmoRegistry;
 import appeng.recipes.ores.IOreListener;
 import appeng.recipes.ores.OreDictionaryHandler;

src/main/java/appeng/core/features/registries/MovableTileRegistry.java

@@ -24,6 +24,7 @@ import java.util.LinkedList;
 
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
+
 import appeng.api.exceptions.AppEngException;
 import appeng.api.movable.IMovableHandler;
 import appeng.api.movable.IMovableRegistry;

src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java

@@ -25,13 +25,15 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.oredict.OreDictionary;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
 import appeng.api.AEApi;
 import appeng.api.config.TunnelType;
 import appeng.api.definitions.Parts;
 import appeng.api.features.IP2PTunnelRegistry;
 import appeng.api.util.AEColor;
 import appeng.util.Platform;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class P2PTunnelRegistry implements IP2PTunnelRegistry
 {

src/main/java/appeng/core/features/registries/PlayerRegistry.java

@@ -18,12 +18,13 @@
 
 package appeng.core.features.registries;
 
+import com.mojang.authlib.GameProfile;
+
 import net.minecraft.entity.player.EntityPlayer;
+
 import appeng.api.features.IPlayerRegistry;
 import appeng.core.WorldSettings;
 
-import com.mojang.authlib.GameProfile;
-
 public class PlayerRegistry implements IPlayerRegistry
 {
 

src/main/java/appeng/core/features/registries/SpecialComparisonRegistry.java

@@ -22,8 +22,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
-import appeng.api.features.IItemComparisonProvider;
+
 import appeng.api.features.IItemComparison;
+import appeng.api.features.IItemComparisonProvider;
 import appeng.api.features.ISpecialComparisonRegistry;
 
 public class SpecialComparisonRegistry implements ISpecialComparisonRegistry

src/main/java/appeng/core/features/registries/WirelessRegistry.java

@@ -25,6 +25,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.world.World;
+
 import appeng.api.features.IWirelessTermHandler;
 import appeng.api.features.IWirelessTermRegistry;
 import appeng.core.localization.PlayerMessages;

src/main/java/appeng/core/features/registries/WorldGenRegistry.java

@@ -22,6 +22,7 @@ import java.util.HashSet;
 
 import net.minecraft.world.World;
 import net.minecraft.world.WorldProvider;
+
 import appeng.api.features.IWorldGen;
 
 public class WorldGenRegistry implements IWorldGen

src/main/java/appeng/core/features/registries/entries/AppEngGrinderRecipe.java

@@ -19,6 +19,7 @@
 package appeng.core.features.registries.entries;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.features.IGrinderEntry;
 
 public class AppEngGrinderRecipe implements IGrinderEntry

src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java

@@ -21,6 +21,7 @@ package appeng.core.features.registries.entries;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+
 import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.storage.ICellHandler;
 import appeng.api.storage.ICellInventory;

src/main/java/appeng/core/features/registries/entries/CreativeCellHandler.java

@@ -21,6 +21,7 @@ package appeng.core.features.registries.entries;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+
 import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.storage.ICellHandler;
 import appeng.api.storage.IMEInventory;

src/main/java/appeng/core/features/registries/entries/ExternalIInv.java

@@ -21,6 +21,7 @@ package appeng.core.features.registries.entries;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IExternalStorageHandler;
 import appeng.api.storage.IMEInventory;

src/main/java/appeng/core/sync/AppEngPacket.java

@@ -19,13 +19,16 @@
 package appeng.core.sync;
 
 import io.netty.buffer.ByteBuf;
+
 import net.minecraft.entity.player.EntityPlayer;
+
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
+
 import appeng.core.AEConfig;
 import appeng.core.AELog;
 import appeng.core.features.AEFeature;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.core.sync.network.NetworkHandler;
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 
 public abstract class AppEngPacket
 {

src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java

@@ -18,13 +18,13 @@
 
 package appeng.core.sync;
 
-import io.netty.buffer.ByteBuf;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.netty.buffer.ByteBuf;
+
 import appeng.core.sync.packets.PacketAssemblerAnimation;
 import appeng.core.sync.packets.PacketClick;
 import appeng.core.sync.packets.PacketCompassRequest;

src/main/java/appeng/core/sync/GuiBridge.java

@@ -31,6 +31,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+
+import cpw.mods.fml.common.network.IGuiHandler;
+import cpw.mods.fml.relauncher.ReflectionHelper;
+
 import appeng.api.AEApi;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.definitions.Materials;
@@ -113,8 +117,6 @@ import appeng.tile.storage.TileDrive;
 import appeng.tile.storage.TileIOPort;
 import appeng.tile.storage.TileSkyChest;
 import appeng.util.Platform;
-import cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.relauncher.ReflectionHelper;
 
 public enum GuiBridge implements IGuiHandler
 {

src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java

@@ -18,16 +18,18 @@
 
 package appeng.core.sync.network;
 
-import io.netty.buffer.ByteBuf;
-
 import java.lang.reflect.InvocationTargetException;
 
+import io.netty.buffer.ByteBuf;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
+
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
+
 import appeng.core.AELog;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.AppEngPacketHandlerBase;
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 
 public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implements IPacketHandler
 {

src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java

@@ -18,15 +18,17 @@
 
 package appeng.core.sync.network;
 
-import io.netty.buffer.ByteBuf;
-
 import java.lang.reflect.InvocationTargetException;
 
+import io.netty.buffer.ByteBuf;
+
 import net.minecraft.entity.player.EntityPlayer;
+
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
+
 import appeng.core.AELog;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.AppEngPacketHandlerBase;
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 
 public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase implements IPacketHandler
 {

src/main/java/appeng/core/sync/network/IPacketHandler.java

@@ -19,6 +19,7 @@
 package appeng.core.sync.network;
 
 import net.minecraft.entity.player.EntityPlayer;
+
 import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 
 public interface IPacketHandler

src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java

@@ -18,20 +18,22 @@
 
 package appeng.core.sync.packets;
 
+import java.io.IOException;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
-import java.io.IOException;
-
 import net.minecraft.entity.player.EntityPlayer;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.EffectType;
 import appeng.core.CommonHelper;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.item.AEItemStack;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class PacketAssemblerAnimation extends AppEngPacket
 {

src/main/java/appeng/core/sync/packets/PacketClick.java

@@ -23,6 +23,7 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.AEApi;
 import appeng.api.implementations.items.IMemoryCard;
 import appeng.api.implementations.items.MemoryCardMessages;

src/main/java/appeng/core/sync/packets/PacketCompassRequest.java

@@ -23,6 +23,7 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
+
 import appeng.api.util.DimensionalCoord;
 import appeng.core.WorldSettings;
 import appeng.core.sync.AppEngPacket;

src/main/java/appeng/core/sync/packets/PacketCompassResponse.java

@@ -22,6 +22,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
+
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.hooks.CompassManager;

src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java

@@ -18,9 +18,6 @@
 
 package appeng.core.sync.packets;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -29,16 +26,21 @@ import java.io.OutputStream;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import appeng.client.gui.implementations.GuiInterfaceTerminal;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class PacketCompressedNBT extends AppEngPacket
 {

src/main/java/appeng/core/sync/packets/PacketConfigButton.java

@@ -23,6 +23,7 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
+
 import appeng.api.config.Settings;
 import appeng.api.util.IConfigManager;
 import appeng.api.util.IConfigurableObject;

src/main/java/appeng/core/sync/packets/PacketCraftRequest.java

@@ -18,14 +18,15 @@
 
 package appeng.core.sync.packets;
 
+import java.util.concurrent.Future;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
-import java.util.concurrent.Future;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;

src/main/java/appeng/core/sync/packets/PacketInventoryAction.java

@@ -18,14 +18,15 @@
 
 package appeng.core.sync.packets;
 
+import java.io.IOException;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
-import java.io.IOException;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
+
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.ClientHelper;
 import appeng.container.AEBaseContainer;

src/main/java/appeng/core/sync/packets/PacketLightning.java

@@ -23,14 +23,16 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import appeng.client.ClientHelper;
 import appeng.client.render.effects.LightningFX;
 import appeng.core.AEConfig;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.Platform;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class PacketLightning extends AppEngPacket
 {

src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java

@@ -18,9 +18,6 @@
 
 package appeng.core.sync.packets;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -30,9 +27,17 @@ import java.util.List;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
+
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.gui.implementations.GuiCraftConfirm;
 import appeng.client.gui.implementations.GuiCraftingCPU;
@@ -42,9 +47,6 @@ import appeng.core.AELog;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.item.AEItemStack;
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class PacketMEInventoryUpdate extends AppEngPacket
 {

src/main/java/appeng/core/sync/packets/PacketMatterCannon.java

@@ -25,13 +25,15 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.world.World;
-import appeng.client.render.effects.MatterCannonFX;
-import appeng.core.sync.AppEngPacket;
-import appeng.core.sync.network.INetworkInfo;
+
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
+import appeng.client.render.effects.MatterCannonFX;
+import appeng.core.sync.AppEngPacket;
+import appeng.core.sync.network.INetworkInfo;
+
 public class PacketMatterCannon extends AppEngPacket
 {
 

src/main/java/appeng/core/sync/packets/PacketMockExplosion.java

@@ -23,11 +23,13 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import appeng.core.CommonHelper;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class PacketMockExplosion extends AppEngPacket
 {

src/main/java/appeng/core/sync/packets/PacketMultiPart.java

@@ -24,6 +24,7 @@ import io.netty.buffer.Unpooled;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.common.MinecraftForge;
+
 import appeng.core.AppEng;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;

src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java

@@ -18,14 +18,14 @@
 
 package appeng.core.sync.packets;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.Container;
@@ -36,6 +36,7 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
+
 import appeng.api.config.Actionable;
 import appeng.api.config.SecurityPermissions;
 import appeng.api.networking.IGrid;

src/main/java/appeng/core/sync/packets/PacketNewStorageDimension.java

@@ -23,11 +23,13 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.DimensionManager;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import appeng.core.AEConfig;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class PacketNewStorageDimension extends AppEngPacket
 {

src/main/java/appeng/core/sync/packets/PacketPaintedEntity.java

@@ -22,6 +22,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
+
 import appeng.api.util.AEColor;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;

src/main/java/appeng/core/sync/packets/PacketPartPlacement.java

@@ -23,6 +23,7 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
+
 import appeng.core.CommonHelper;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;

src/main/java/appeng/core/sync/packets/PacketPartialItem.java

@@ -22,6 +22,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
+
 import appeng.container.AEBaseContainer;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;

src/main/java/appeng/core/sync/packets/PacketPatternSlot.java

@@ -18,14 +18,15 @@
 
 package appeng.core.sync.packets;
 
+import java.io.IOException;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
-import java.io.IOException;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.IInventory;
+
 import appeng.api.AEApi;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.container.implementations.ContainerPatternTerm;

src/main/java/appeng/core/sync/packets/PacketProgressBar.java

@@ -23,6 +23,7 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
+
 import appeng.container.AEBaseContainer;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;

src/main/java/appeng/core/sync/packets/PacketSwapSlots.java

@@ -22,6 +22,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
+
 import appeng.container.AEBaseContainer;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;

src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java

@@ -24,6 +24,7 @@ import io.netty.buffer.Unpooled;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.tileentity.TileEntity;
+
 import appeng.client.gui.AEBaseGui;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerOpenContext;

src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java

@@ -29,14 +29,16 @@ import net.minecraft.init.Items;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import appeng.client.ClientHelper;
 import appeng.client.render.effects.EnergyFx;
 import appeng.core.CommonHelper;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.Platform;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class PacketTransitionEffect extends AppEngPacket
 {

src/main/java/appeng/core/sync/packets/PacketValueConfig.java

@@ -18,20 +18,21 @@
 
 package appeng.core.sync.packets;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.FuzzyMode;
 import appeng.api.util.IConfigManager;
 import appeng.api.util.IConfigurableObject;