Organize imports

src/main/java/appeng/me/GridStorage.java

@@ -26,6 +26,7 @@ import java.util.WeakHashMap;
 
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridStorage;
 import appeng.core.AELog;

src/main/java/appeng/me/cache/CraftingGridCache.java

@@ -18,15 +18,31 @@
 
 package appeng.me.cache;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 
-import com.google.common.collect.*;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimap;
+
 import net.minecraft.world.World;
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.networking.IGrid;

src/main/java/appeng/me/cache/EnergyGridCache.java

@@ -25,6 +25,9 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.TreeSet;
 
+import com.google.common.collect.HashMultiset;
+import com.google.common.collect.Multiset;
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
@@ -50,9 +53,6 @@ import appeng.me.GridNode;
 import appeng.me.energy.EnergyThreshold;
 import appeng.me.energy.EnergyWatcher;
 
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Multiset;
-
 public class EnergyGridCache implements IEnergyGrid
 {
 

src/main/java/appeng/me/cache/GridStorageCache.java

@@ -23,6 +23,9 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.SetMultimap;
+
 import appeng.api.AEApi;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridHost;
@@ -50,9 +53,6 @@ import appeng.me.helpers.GenericInterestManager;
 import appeng.me.storage.ItemWatcher;
 import appeng.me.storage.NetworkInventoryHandler;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.SetMultimap;
-
 public class GridStorageCache implements IStorageGrid
 {
 

src/main/java/appeng/me/cache/P2PCache.java

@@ -20,6 +20,9 @@ package appeng.me.cache;
 
 import java.util.HashMap;
 
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
+
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridCache;
@@ -34,9 +37,6 @@ import appeng.me.cache.helpers.TunnelCollection;
 import appeng.parts.p2p.PartP2PTunnel;
 import appeng.parts.p2p.PartP2PTunnelME;
 
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Multimap;
-
 public class P2PCache implements IGridCache
 {
 

src/main/java/appeng/me/cache/PathGridCache.java

@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Set;
 
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridBlock;

src/main/java/appeng/me/cache/SecurityCache.java

@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
+
 import appeng.api.config.SecurityPermissions;
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridHost;

src/main/java/appeng/me/cache/TickManagerCache.java

@@ -24,6 +24,7 @@ import java.util.PriorityQueue;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.crash.CrashReportCategory;
 import net.minecraft.util.ReportedException;
+
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;

src/main/java/appeng/me/cache/helpers/TickTracker.java

@@ -19,6 +19,7 @@
 package appeng.me.cache.helpers;
 
 import net.minecraft.crash.CrashReportCategory;
+
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickingRequest;

src/main/java/appeng/me/cluster/MBCalculator.java

@@ -21,6 +21,7 @@ package appeng.me.cluster;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.util.WorldCoord;
 import appeng.core.AELog;
 import appeng.util.Platform;

src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java

@@ -23,6 +23,7 @@ import java.util.Iterator;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 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/me/cluster/implementations/CraftingCPUCluster.java

@@ -26,6 +26,9 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -35,9 +38,6 @@ import net.minecraft.world.WorldServer;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;

src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java

@@ -20,6 +20,7 @@ package appeng.me.cluster.implementations;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import appeng.api.AEApi;
 import appeng.api.util.WorldCoord;
 import appeng.me.cluster.IAECluster;

src/main/java/appeng/me/cluster/implementations/QuantumCluster.java

@@ -27,6 +27,9 @@ import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.world.WorldEvent;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
 import appeng.api.AEApi;
 import appeng.api.events.LocatableEventAnnounce;
 import appeng.api.events.LocatableEventAnnounce.LocatableEvent;
@@ -39,7 +42,6 @@ import appeng.me.cache.helpers.ConnectionWrapper;
 import appeng.me.cluster.IAECluster;
 import appeng.tile.qnb.TileQuantumBridge;
 import appeng.util.iterators.ChainedIterator;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class QuantumCluster implements ILocatable, IAECluster
 {

src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java

@@ -20,6 +20,7 @@ package appeng.me.cluster.implementations;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.WorldCoord;
 import appeng.me.cluster.IAECluster;

src/main/java/appeng/me/helpers/AENetworkProxy.java

@@ -25,6 +25,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.AEApi;
 import appeng.api.networking.GridFlags;
 import appeng.api.networking.GridNotification;

src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java

@@ -21,6 +21,7 @@ package appeng.me.helpers;
 import java.util.Iterator;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.networking.IGridMultiblock;
 import appeng.api.networking.IGridNode;
 import appeng.me.cluster.IAECluster;

src/main/java/appeng/me/helpers/GenericInterestManager.java

@@ -21,10 +21,10 @@ package appeng.me.helpers;
 import java.util.Collection;
 import java.util.LinkedList;
 
-import appeng.api.storage.data.IAEStack;
-
 import com.google.common.collect.Multimap;
 
+import appeng.api.storage.data.IAEStack;
+
 public class GenericInterestManager<T>
 {
 

src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java

@@ -18,8 +18,8 @@
 
 package appeng.me.pathfinding;
 
-import appeng.api.networking.IGridConnectionVisitor;
 import appeng.api.networking.IGridConnection;
+import appeng.api.networking.IGridConnectionVisitor;
 import appeng.api.networking.IGridNode;
 import appeng.me.GridConnection;
 import appeng.me.GridNode;

src/main/java/appeng/me/pathfinding/ControllerChannelUpdater.java

@@ -18,8 +18,8 @@
 
 package appeng.me.pathfinding;
 
-import appeng.api.networking.IGridConnectionVisitor;
 import appeng.api.networking.IGridConnection;
+import appeng.api.networking.IGridConnectionVisitor;
 import appeng.api.networking.IGridNode;
 import appeng.me.GridConnection;
 import appeng.me.GridNode;

src/main/java/appeng/me/storage/AEExternalHandler.java

@@ -20,6 +20,7 @@ package appeng.me.storage;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;
+
 import appeng.api.implementations.tiles.ITileStorageMonitorable;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IExternalStorageHandler;

src/main/java/appeng/me/storage/CellInventory.java

@@ -26,6 +26,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.oredict.OreDictionary;
+
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.FuzzyMode;

src/main/java/appeng/me/storage/CellInventoryHandler.java

@@ -21,6 +21,7 @@ package appeng.me.storage;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.AEApi;
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.IncludeExclude;

src/main/java/appeng/me/storage/CreativeCellInventory.java

@@ -19,6 +19,7 @@
 package appeng.me.storage;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;

src/main/java/appeng/me/storage/DriveWatcher.java

@@ -19,6 +19,7 @@
 package appeng.me.storage;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.Actionable;
 import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.networking.security.BaseActionSource;

src/main/java/appeng/me/storage/MEIInventoryWrapper.java

@@ -20,6 +20,7 @@ package appeng.me.storage;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IMEInventory;

src/main/java/appeng/me/storage/SecurityInventory.java

@@ -18,6 +18,8 @@
 
 package appeng.me.storage;
 
+import com.mojang.authlib.GameProfile;
+
 import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
@@ -32,8 +34,6 @@ import appeng.api.storage.data.IItemList;
 import appeng.me.GridAccessException;
 import appeng.tile.misc.TileSecurity;
 
-import com.mojang.authlib.GameProfile;
-
 public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
 {