Organize imports

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.CrashInfo;
 import appeng.core.crash.IntegrationCrashEnhancement;
 import appeng.core.crash.ModCrashEnhancement;

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

@@ -19,13 +19,13 @@
 package appeng.core;
 
 
+import com.google.common.base.Optional;
+
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import com.google.common.base.Optional;
-
 import appeng.api.AEApi;
 import appeng.items.parts.ItemFacade;
 

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/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/features/AEBlockFeatureHandler.java

@@ -21,10 +21,10 @@ package appeng.core.features;
 
 import java.util.EnumSet;
 
-import cpw.mods.fml.common.registry.GameRegistry;
-
 import com.google.common.base.Optional;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+
 import appeng.api.definitions.ITileDefinition;
 import appeng.block.AEBaseBlock;
 import appeng.core.CommonHelper;

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

@@ -21,16 +21,16 @@ package appeng.core.features;
 
 import java.lang.reflect.Constructor;
 
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ObjectArrays;
+
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ObjectArrays;
-
 import appeng.api.definitions.IBlockDefinition;
 import appeng.block.AEBaseBlock;
 

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

@@ -21,13 +21,13 @@ package appeng.core.features;
 
 import javax.annotation.Nonnull;
 
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-
 import appeng.api.definitions.IItemDefinition;
 
 

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

@@ -19,13 +19,13 @@
 package appeng.core.features;
 
 
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-
 import appeng.api.definitions.IItemDefinition;
 import appeng.util.Platform;
 

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

@@ -21,12 +21,12 @@ package appeng.core.features;
 
 import java.util.EnumSet;
 
+import com.google.common.base.Optional;
+
 import net.minecraft.item.Item;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 
-import com.google.common.base.Optional;
-
 import appeng.api.definitions.IItemDefinition;
 import appeng.core.CreativeTab;
 import appeng.core.CreativeTabFacade;

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

@@ -21,12 +21,12 @@ package appeng.core.features;
 
 import java.util.EnumSet;
 
+import com.google.common.base.Optional;
+
 import net.minecraft.block.BlockStairs;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 
-import com.google.common.base.Optional;
-
 import appeng.api.definitions.IBlockDefinition;
 import appeng.core.CreativeTab;
 

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

@@ -19,11 +19,11 @@
 package appeng.core.features;
 
 
-import net.minecraft.tileentity.TileEntity;
-
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 
+import net.minecraft.tileentity.TileEntity;
+
 import appeng.api.definitions.ITileDefinition;
 import appeng.block.AEBaseBlock;
 

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

@@ -19,6 +19,10 @@
 package appeng.core.features;
 
 
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
@@ -26,10 +30,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-
 import appeng.api.definitions.ITileDefinition;
 
 

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

@@ -7,6 +7,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+
 import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemStack;

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

@@ -19,10 +19,10 @@
 package appeng.core.features.registries;
 
 
-import net.minecraft.entity.player.EntityPlayer;
-
 import com.mojang.authlib.GameProfile;
 
+import net.minecraft.entity.player.EntityPlayer;
+
 import appeng.api.features.IPlayerRegistry;
 import appeng.core.WorldSettings;
 

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

@@ -2,6 +2,7 @@ package appeng.core.features.registries.entries;
 
 
 import java.util.Collection;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 

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

@@ -4,13 +4,14 @@ package appeng.core.features.registries.entries;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.minecraft.item.ItemStack;
-
 import com.google.common.base.Optional;
 
+import net.minecraft.item.ItemStack;
+
 import appeng.api.features.IInscriberRecipe;
 import appeng.api.features.InscriberProcessType;
 

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

@@ -19,6 +19,10 @@
 package appeng.core.sync;
 
 
+import static appeng.core.sync.GuiHostType.ITEM;
+import static appeng.core.sync.GuiHostType.ITEM_OR_WORLD;
+import static appeng.core.sync.GuiHostType.WORLD;
+
 import java.lang.reflect.Constructor;
 import java.util.List;
 
@@ -119,10 +123,6 @@ import appeng.tile.storage.TileIOPort;
 import appeng.tile.storage.TileSkyChest;
 import appeng.util.Platform;
 
-import static appeng.core.sync.GuiHostType.ITEM;
-import static appeng.core.sync.GuiHostType.ITEM_OR_WORLD;
-import static appeng.core.sync.GuiHostType.WORLD;
-
 
 public enum GuiBridge implements IGuiHandler
 {

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

@@ -27,6 +27,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
+
 import javax.annotation.Nullable;
 
 import io.netty.buffer.ByteBuf;