Organize imports

src/main/java/appeng/util/ConfigManager.java

@@ -21,9 +21,10 @@ package appeng.util;
 import java.util.HashMap;
 import java.util.Set;
 
+import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.config.LevelEmitterMode;
 import appeng.api.config.StorageFilter;
-import net.minecraft.nbt.NBTTagCompound;
 import appeng.api.util.IConfigManager;
 import appeng.core.AELog;
 

src/main/java/appeng/util/InventoryAdaptor.java

@@ -26,6 +26,9 @@ import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntityChest;
 import net.minecraftforge.common.util.ForgeDirection;
+
+import buildcraft.api.inventory.ISpecialInventory;
+
 import appeng.api.config.FuzzyMode;
 import appeng.core.AppEng;
 import appeng.integration.IntegrationType;
@@ -37,7 +40,6 @@ import appeng.util.inv.AdaptorPlayerInventory;
 import appeng.util.inv.IInventoryDestination;
 import appeng.util.inv.ItemSlot;
 import appeng.util.inv.WrapperMCISidedInventory;
-import buildcraft.api.inventory.ISpecialInventory;
 
 public abstract class InventoryAdaptor implements Iterable<ItemSlot>
 {

src/main/java/appeng/util/inv/AdaptorBCPipe.java

@@ -23,6 +23,7 @@ import java.util.Iterator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.config.FuzzyMode;
 import appeng.core.AppEng;
 import appeng.integration.IntegrationType;

src/main/java/appeng/util/inv/AdaptorIInventory.java

@@ -23,6 +23,7 @@ import java.util.Iterator;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.FuzzyMode;
 import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;

src/main/java/appeng/util/inv/AdaptorISpecialInventory.java

@@ -23,9 +23,11 @@ import java.util.Iterator;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
+
+import buildcraft.api.inventory.ISpecialInventory;
+
 import appeng.api.config.FuzzyMode;
 import appeng.util.InventoryAdaptor;
-import buildcraft.api.inventory.ISpecialInventory;
 
 public class AdaptorISpecialInventory extends InventoryAdaptor
 {

src/main/java/appeng/util/inv/AdaptorList.java

@@ -22,6 +22,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.FuzzyMode;
 import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;

src/main/java/appeng/util/inv/AdaptorPlayerHand.java

@@ -24,6 +24,7 @@ import java.util.Iterator;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.FuzzyMode;
 import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;

src/main/java/appeng/util/inv/IMEAdaptor.java

@@ -20,7 +20,10 @@ package appeng.util.inv;
 
 import java.util.Iterator;
 
+import com.google.common.collect.ImmutableList;
+
 import net.minecraft.item.ItemStack;
+
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;
@@ -31,8 +34,6 @@ import appeng.api.storage.data.IItemList;
 import appeng.util.InventoryAdaptor;
 import appeng.util.item.AEItemStack;
 
-import com.google.common.collect.ImmutableList;
-
 public class IMEAdaptor extends InventoryAdaptor
 {
 

src/main/java/appeng/util/inv/IMEInventoryDestination.java

@@ -19,6 +19,7 @@
 package appeng.util.inv;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.Actionable;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.data.IAEItemStack;

src/main/java/appeng/util/inv/ItemSlot.java

@@ -19,6 +19,7 @@
 package appeng.util.inv;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.storage.data.IAEItemStack;
 import appeng.util.item.AEItemStack;
 

src/main/java/appeng/util/inv/WrapperBCPipe.java

@@ -23,6 +23,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.core.AppEng;
 import appeng.integration.IntegrationType;
 import appeng.integration.abstraction.IBC;

src/main/java/appeng/util/item/AEFluidStack.java

@@ -18,19 +18,20 @@
 
 package appeng.util.item;
 
-import io.netty.buffer.ByteBuf;
-
 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 net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
+
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEFluidStack;

src/main/java/appeng/util/item/AEItemDef.java

@@ -23,11 +23,13 @@ import java.util.List;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import appeng.util.Platform;
+
 import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
+import appeng.util.Platform;
+
 public class AEItemDef
 {
 

src/main/java/appeng/util/item/AEItemStack.java

@@ -18,8 +18,6 @@
 
 package appeng.util.item;
 
-import io.netty.buffer.ByteBuf;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -27,19 +25,23 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.List;
 
+import io.netty.buffer.ByteBuf;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAETagCompound;
 import appeng.util.Platform;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemStack, Comparable<AEItemStack>
 {

src/main/java/appeng/util/item/AESharedNBT.java

@@ -24,6 +24,7 @@ import java.util.WeakHashMap;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.AEApi;
 import appeng.api.features.IItemComparison;
 import appeng.api.storage.data.IAETagCompound;

src/main/java/appeng/util/item/AEStack.java

@@ -18,10 +18,10 @@
 
 package appeng.util.item;
 
-import io.netty.buffer.ByteBuf;
-
 import java.io.IOException;
 
+import io.netty.buffer.ByteBuf;
+
 import appeng.api.storage.data.IAEStack;
 
 public abstract class AEStack<StackType extends IAEStack> implements IAEStack<StackType>

src/main/java/appeng/util/item/OreHelper.java

@@ -24,6 +24,7 @@ import java.util.HashMap;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
+
 import appeng.api.storage.data.IAEItemStack;
 
 public class OreHelper

src/main/java/appeng/util/item/OreReference.java

@@ -25,6 +25,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.storage.data.IAEItemStack;
 
 public class OreReference

src/main/java/appeng/util/item/SharedSearchObject.java

@@ -20,6 +20,7 @@ package appeng.util.item;
 
 import net.minecraft.item.Item;
 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.util.Platform;
 
 public class SharedSearchObject

src/main/java/appeng/util/iterators/ProxyNodeIterator.java

@@ -21,6 +21,7 @@ package appeng.util.iterators;
 import java.util.Iterator;
 
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 

src/main/java/appeng/util/iterators/StackToSlotIterator.java

@@ -21,6 +21,7 @@ package appeng.util.iterators;
 import java.util.Iterator;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.util.inv.ItemSlot;
 
 public class StackToSlotIterator implements Iterator<ItemSlot>