Organise imports

2016-09-17 17:05:07 +02:00
parent 035dc244ff
commit 71396637e3
55 changed files with 58 additions and 28 deletions
@@ -21,6 +21,7 @@ package appeng.block;

 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.Nullable;

 import net.minecraft.block.Block;
@@ -21,6 +21,7 @@ package appeng.block;

 import java.util.ArrayList;
 import java.util.List;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

@@ -20,6 +20,7 @@ package appeng.block.crafting;


 import java.util.EnumSet;
+
 import javax.annotation.Nullable;

 import net.minecraft.block.Block;
@@ -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;
@@ -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;
@@ -20,6 +20,7 @@ package appeng.block.misc;


 import java.util.Random;
+
 import javax.annotation.Nullable;

 import net.minecraft.block.material.Material;
@@ -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;
@@ -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;
@@ -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;
@@ -20,6 +20,7 @@ package appeng.bootstrap.components;


 import java.util.Map;
+
 import javax.annotation.Nonnull;

 import net.minecraft.client.Minecraft;
@@ -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;
@@ -20,6 +20,7 @@ package appeng.client.render;


 import java.util.List;
+
 import javax.annotation.Nullable;

 import net.minecraft.block.state.IBlockState;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;

@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -32,7 +32,6 @@ import net.minecraftforge.fml.common.discovery.ASMDataTable;

 import appeng.api.AEInjectable;
 import appeng.api.AEPlugin;
-import appeng.api.exceptions.AppEngException;


 /**
@@ -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;
@@ -20,6 +20,7 @@ package appeng.core.features;


 import java.util.Optional;
+
 import com.google.common.base.Preconditions;

 import net.minecraft.block.Block;
@@ -20,6 +20,7 @@ package appeng.core.features;


 import java.util.Optional;
+
 import javax.annotation.Nonnull;

 import com.google.common.base.Preconditions;
@@ -20,6 +20,7 @@ package appeng.core.features;


 import java.util.Optional;
+
 import javax.annotation.Nonnull;

 import com.google.common.base.Preconditions;
@@ -20,6 +20,7 @@ package appeng.core.features;


 import java.util.Optional;
+
 import javax.annotation.Nonnull;

 import net.minecraft.item.ItemBlock;
@@ -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;
@@ -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
@@ -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;

@@ -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;
@@ -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;
@@ -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;


@@ -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;
@@ -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;

@@ -20,6 +20,7 @@ package appeng.items.tools.powered;


 import java.util.List;
+
 import javax.annotation.Nullable;

 import net.minecraft.block.Block;
@@ -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;
@@ -21,7 +21,6 @@ package appeng.parts;

 import java.util.LinkedList;
 import java.util.List;
-
 import java.util.Optional;

 import net.minecraft.block.Block;
@@ -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;
@@ -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;
@@ -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;

@@ -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;

@@ -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;
@@ -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;
@@ -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;