Organise imports

src/api/java/appeng/api/definitions/IItemDefinition.java

@@ -24,10 +24,10 @@
 package appeng.api.definitions;
 
 
-import javax.annotation.Nonnull;
-
 import java.util.Optional;
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 

src/api/java/appeng/api/features/IInscriberRecipe.java

@@ -20,11 +20,10 @@ package appeng.api.features;
 
 
 import java.util.List;
+import java.util.Optional;
 
 import javax.annotation.Nonnull;
 
-import java.util.Optional;
-
 import net.minecraft.item.ItemStack;
 
 

src/api/java/appeng/api/features/IRegistryContainer.java

@@ -24,13 +24,14 @@
 package appeng.api.features;
 
 
+import net.minecraftforge.items.IItemHandler;
+
 import appeng.api.AEInjectable;
 import appeng.api.movable.IMovableRegistry;
 import appeng.api.networking.IGridCacheRegistry;
 import appeng.api.parts.IPartModels;
 import appeng.api.storage.ICellRegistry;
 import appeng.api.storage.IExternalStorageRegistry;
-import net.minecraftforge.items.IItemHandler;
 
 
 /**

src/api/java/appeng/api/storage/IExternalStorageHandler.java

@@ -27,6 +27,7 @@ package appeng.api.storage;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.items.IItemHandler;
+
 import appeng.api.networking.security.BaseActionSource;
 
 

src/api/java/appeng/api/storage/IExternalStorageRegistry.java

@@ -27,6 +27,7 @@ package appeng.api.storage;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.items.IItemHandler;
+
 import appeng.api.IAppEngApi;
 import appeng.api.networking.security.BaseActionSource;
 

src/main/java/appeng/block/AEBaseBlock.java

@@ -21,6 +21,7 @@ package appeng.block;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;

src/main/java/appeng/block/AEBaseTileBlock.java

@@ -21,6 +21,7 @@ package appeng.block;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 

src/main/java/appeng/block/crafting/BlockCraftingUnit.java

@@ -20,6 +20,7 @@ package appeng.block.crafting;
 
 
 import java.util.EnumSet;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;

src/main/java/appeng/block/misc/BlockCharger.java

@@ -22,6 +22,7 @@ package appeng.block.misc;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
+
 import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;

src/main/java/appeng/block/misc/BlockTinyTNT.java

@@ -21,6 +21,7 @@ package appeng.block.misc;
 
 import java.util.Collections;
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;

src/main/java/appeng/block/misc/BlockVibrationChamber.java

@@ -20,6 +20,7 @@ package appeng.block.misc;
 
 
 import java.util.Random;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.material.Material;

src/main/java/appeng/block/networking/BlockCableBus.java

@@ -22,6 +22,7 @@ package appeng.block.networking;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;

src/main/java/appeng/block/networking/BlockWireless.java

@@ -21,6 +21,7 @@ package appeng.block.networking;
 
 import java.util.Collections;
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.state.IBlockState;

src/main/java/appeng/block/storage/BlockSkyChest.java

@@ -21,6 +21,7 @@ package appeng.block.storage;
 
 import java.util.Collections;
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.material.Material;

src/main/java/appeng/bootstrap/components/ItemModelComponent.java

@@ -20,6 +20,7 @@ package appeng.bootstrap.components;
 
 
 import java.util.Map;
+
 import javax.annotation.Nonnull;
 
 import net.minecraft.client.Minecraft;

src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java

@@ -21,6 +21,7 @@ package appeng.client.render;
 
 import java.util.Collections;
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;

src/main/java/appeng/client/render/FacadeWithBlockBakedModel.java

@@ -20,6 +20,7 @@ package appeng.client.render;
 
 
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.state.IBlockState;

src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java

@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.state.IBlockState;

src/main/java/appeng/client/render/cablebus/CubeBuilder.java

@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.List;
+
 import javax.vecmath.Vector4f;
 
 import com.google.common.base.Preconditions;

src/main/java/appeng/client/render/cablebus/QuadRotator.java

@@ -21,6 +21,7 @@ package appeng.client.render.cablebus;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.vecmath.Matrix4f;
 import javax.vecmath.Point3f;
 import javax.vecmath.Vector3f;

src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java

@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.state.IBlockState;

src/main/java/appeng/client/render/model/AutoRotatingModel.java

@@ -21,6 +21,7 @@ package appeng.client.render.model;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.vecmath.Vector3f;
 import javax.vecmath.Vector4f;
 

src/main/java/appeng/client/render/model/DriveBakedModel.java

@@ -21,6 +21,7 @@ package appeng.client.render.model;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Nullable;
 import javax.vecmath.Matrix4f;
 import javax.vecmath.Vector3f;

src/main/java/appeng/client/render/model/SkyCompassBakedModel.java

@@ -22,6 +22,7 @@ package appeng.client.render.model;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import javax.annotation.Nullable;
 import javax.vecmath.AxisAngle4f;
 import javax.vecmath.Matrix4f;

src/main/java/appeng/client/render/model/UVLModelLoader.java

@@ -32,6 +32,7 @@ import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.annotation.Nullable;
 
 import com.google.common.base.Charsets;

src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java

@@ -21,6 +21,7 @@ package appeng.client.render.spatial;
 
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableMap;

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

@@ -22,6 +22,7 @@ package appeng.core;
 import java.io.File;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+
 import javax.annotation.Nonnull;
 
 import com.google.common.base.Stopwatch;

src/main/java/appeng/core/PluginLoader.java

@@ -32,7 +32,6 @@ import net.minecraftforge.fml.common.discovery.ASMDataTable;
 
 import appeng.api.AEInjectable;
 import appeng.api.AEPlugin;
-import appeng.api.exceptions.AppEngException;
 
 
 /**

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

@@ -22,6 +22,7 @@ package appeng.core;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.annotation.Nonnull;
 
 import com.google.common.base.Preconditions;

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

@@ -20,6 +20,7 @@ package appeng.core.features;
 
 
 import java.util.Optional;
+
 import com.google.common.base.Preconditions;
 
 import net.minecraft.block.Block;

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

@@ -20,6 +20,7 @@ package appeng.core.features;
 
 
 import java.util.Optional;
+
 import javax.annotation.Nonnull;
 
 import com.google.common.base.Preconditions;

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

@@ -20,6 +20,7 @@ package appeng.core.features;
 
 
 import java.util.Optional;
+
 import javax.annotation.Nonnull;
 
 import com.google.common.base.Preconditions;

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

@@ -20,6 +20,7 @@ package appeng.core.features;
 
 
 import java.util.Optional;
+
 import javax.annotation.Nonnull;
 
 import net.minecraft.item.ItemBlock;

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

@@ -22,12 +22,11 @@ package appeng.core.features.registries.entries;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import java.util.Optional;
-
 import net.minecraft.item.ItemStack;
 
 import appeng.api.features.IInscriberRecipe;

src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java

@@ -19,12 +19,11 @@
 package appeng.core.worlddata;
 
 
+import java.util.Optional;
 import java.util.UUID;
 
 import javax.annotation.Nonnull;
 
-import java.util.Optional;
-
 
 /**
  * @author thatsIch

src/main/java/appeng/core/worlddata/PlayerData.java

@@ -19,12 +19,12 @@
 package appeng.core.worlddata;
 
 
+import java.util.Optional;
 import java.util.UUID;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import java.util.Optional;
 import com.google.common.base.Preconditions;
 import com.mojang.authlib.GameProfile;
 

src/main/java/appeng/core/worlddata/PlayerMapping.java

@@ -20,11 +20,11 @@ package appeng.core.worlddata;
 
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 import javax.annotation.Nonnull;
 
-import java.util.Optional;
 import com.google.common.base.Preconditions;
 
 import net.minecraftforge.common.config.ConfigCategory;

src/main/java/appeng/entity/EntityFloatingItem.java

@@ -19,7 +19,6 @@
 package appeng.entity;
 
 
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;

src/main/java/appeng/helpers/MetaRotation.java

@@ -28,7 +28,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import appeng.api.util.IOrientable;
-import appeng.block.AEBaseBlock;
 import appeng.decorative.solid.BlockQuartzPillar;
 
 

src/main/java/appeng/items/misc/ItemCrystalSeed.java

@@ -21,6 +21,7 @@ package appeng.items.misc;
 
 import java.util.List;
 import java.util.Optional;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;

src/main/java/appeng/items/parts/ItemMultiPart.java

@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 

src/main/java/appeng/items/tools/powered/ToolMassCannon.java

@@ -20,6 +20,7 @@ package appeng.items.tools.powered;
 
 
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;

src/main/java/appeng/parts/CableBusContainer.java

@@ -25,6 +25,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
+
 import javax.annotation.Nullable;
 
 import io.netty.buffer.ByteBuf;

src/main/java/appeng/parts/PartPlacement.java

@@ -21,7 +21,6 @@ package appeng.parts;
 
 import java.util.LinkedList;
 import java.util.List;
-
 import java.util.Optional;
 
 import net.minecraft.block.Block;

src/main/java/appeng/parts/automation/PlaneBakedModel.java

@@ -22,6 +22,7 @@ package appeng.parts.automation;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableList;

src/main/java/appeng/recipes/AEItemResolver.java

@@ -31,8 +31,8 @@ import appeng.api.recipes.ResolverResultSet;
 import appeng.api.util.AEColor;
 import appeng.api.util.AEColoredItemDefinition;
 import appeng.core.AppEng;
-import appeng.items.materials.MaterialType;
 import appeng.items.materials.ItemMultiItem;
+import appeng.items.materials.MaterialType;
 import appeng.items.misc.ItemCrystalSeed;
 import appeng.items.parts.ItemMultiPart;
 import appeng.items.parts.PartType;

src/main/java/appeng/recipes/RecipeHandler.java

@@ -29,12 +29,12 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import javax.annotation.Nonnull;
 
-import java.util.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
 

src/main/java/appeng/recipes/game/DisassembleRecipe.java

@@ -22,6 +22,7 @@ package appeng.recipes.game;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 

src/main/java/appeng/services/CompassService.java

@@ -28,6 +28,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+
 import javax.annotation.Nonnull;
 
 import com.google.common.base.Preconditions;

src/main/java/appeng/util/ClassInstantiation.java

@@ -21,7 +21,6 @@ package appeng.util;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-
 import java.util.Optional;
 
 import appeng.core.AELog;

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

@@ -26,6 +26,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.security.InvalidParameterException;
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import io.netty.buffer.ByteBuf;

src/test/java/appeng/services/version/VersionParserTest.java

@@ -2,6 +2,10 @@
 package appeng.services.version;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 
 import appeng.services.version.exceptions.InvalidBuildException;
@@ -11,10 +15,6 @@ import appeng.services.version.exceptions.InvalidVersionException;
 import appeng.services.version.exceptions.MissingSeparatorException;
 import appeng.services.version.exceptions.VersionCheckerException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 
 /**
  * Tests for {@link VersionParser}

src/test/java/appeng/util/SlimReadableNumberConverterTest.java

@@ -2,10 +2,10 @@
 package appeng.util;
 
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Test;
+
 
 /**
  * Test for {@link ISlimReadableNumberConverter}

src/test/java/appeng/util/UUIDMatcherTest.java

@@ -19,11 +19,11 @@
 package appeng.util;
 
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 
 /**
  * Tests for {@link UUIDMatcher}

src/test/java/appeng/util/WideReadableNumberConverterTest.java

@@ -2,10 +2,10 @@
 package appeng.util;
 
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 
+import org.junit.Test;
+
 
 /**
  * Test for {@link IWideReadableNumberConverter}