Organize imports

2016-01-01 01:47:22 +01:00
parent 72923cadb4
commit 68c3ea5ae9
77 changed files with 127 additions and 88 deletions
@@ -1,13 +1,13 @@
 package appeng.api.definitions;


+import com.google.common.base.Optional;
+
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;

-import com.google.common.base.Optional;
-

 public interface IBlockDefinition extends IItemDefinition
 {
@@ -25,6 +25,7 @@ package appeng.api.definitions;


 import javax.annotation.Nonnull;
+
 import com.google.common.base.Optional;

 import net.minecraft.item.Item;
@@ -1,10 +1,10 @@
 package appeng.api.definitions;


-import net.minecraft.tileentity.TileEntity;
-
 import com.google.common.base.Optional;

+import net.minecraft.tileentity.TileEntity;
+

 public interface ITileDefinition extends IBlockDefinition
 {
@@ -25,6 +25,7 @@ package appeng.api.events;


 import net.minecraftforge.fml.common.eventhandler.Event;
+
 import appeng.api.features.ILocatable;


@@ -5,10 +5,10 @@ import java.util.List;

 import javax.annotation.Nonnull;

-import net.minecraft.item.ItemStack;
-
 import com.google.common.base.Optional;

+import net.minecraft.item.ItemStack;
+

 /**
 * Registration Records for {@link IInscriberRegistry}
@@ -27,6 +27,7 @@ package appeng.api.features;
 import javax.annotation.Nullable;

 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.TunnelType;


@@ -26,6 +26,7 @@ package appeng.api.features;

 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.util.IConfigManager;


@@ -27,6 +27,7 @@ package appeng.api.implementations;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+
 import appeng.api.networking.crafting.ICraftingPatternDetails;


@@ -25,6 +25,7 @@ package appeng.api.implementations;


 import net.minecraft.tileentity.TileEntity;
+
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.tiles.ISegmentedInventory;
 import appeng.api.util.IConfigurableObject;
@@ -25,6 +25,7 @@ package appeng.api.implementations.guiobjects;


 import net.minecraft.inventory.IInventory;
+
 import appeng.api.networking.IGridHost;


@@ -25,6 +25,7 @@ package appeng.api.implementations.items;


 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.networking.energy.IAEPowerStorage;

@@ -26,13 +26,14 @@ package appeng.api.implementations.items;

 import java.util.EnumSet;

+import com.mojang.authlib.GameProfile;
+
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.SecurityPermissions;
 import appeng.api.features.IPlayerRegistry;
 import appeng.api.networking.security.ISecurityRegistry;

-import com.mojang.authlib.GameProfile;
-

 public interface IBiometricCard
 {
@@ -27,6 +27,7 @@ package appeng.api.implementations.items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+
 import appeng.api.implementations.TransitionResult;
 import appeng.api.util.WorldCoord;

@@ -25,6 +25,7 @@ package appeng.api.implementations.items;


 import net.minecraft.item.ItemStack;
+
 import appeng.api.storage.ICellWorkbenchItem;
 import appeng.api.storage.data.IAEItemStack;

@@ -25,6 +25,7 @@ package appeng.api.implementations.items;


 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.Upgrades;


@@ -28,6 +28,7 @@ import java.util.EnumSet;

 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.EnumFacing;
+
 import appeng.api.networking.IGridHost;
 import appeng.api.parts.BusSupport;
 import appeng.api.parts.IPart;
@@ -26,6 +26,7 @@ package appeng.api.implementations.tiles;

 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.EnumFacing;
+
 import appeng.api.util.AEColor;


@@ -26,6 +26,7 @@ package appeng.api.implementations.tiles;

 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.util.EnumFacing;
+
 import appeng.api.networking.crafting.ICraftingPatternDetails;


@@ -25,6 +25,7 @@ package appeng.api.implementations.tiles;


 import net.minecraft.util.EnumFacing;
+
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IStorageMonitorable;

@@ -28,6 +28,7 @@ import java.util.EnumSet;

 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
+
 import appeng.api.parts.IPart;
 import appeng.api.util.AEColor;
 import appeng.api.util.DimensionalCoord;
@@ -25,6 +25,7 @@ package appeng.api.networking;


 import net.minecraft.tileentity.TileEntity;
+
 import appeng.api.parts.IPart;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
@@ -28,6 +28,7 @@ import java.util.EnumSet;

 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
+
 import appeng.api.IAppEngApi;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IReadOnlyCollection;
@@ -26,15 +26,16 @@ package appeng.api.networking.crafting;

 import java.util.concurrent.Future;

+import com.google.common.collect.ImmutableCollection;
+import com.google.common.collect.ImmutableSet;
+
 import net.minecraft.world.World;
+
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridCache;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.data.IAEItemStack;

-import com.google.common.collect.ImmutableCollection;
-import com.google.common.collect.ImmutableSet;
-

 public interface ICraftingGrid extends IGridCache
 {
@@ -27,6 +27,7 @@ package appeng.api.networking.crafting;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+
 import appeng.api.implementations.ICraftingPatternItem;
 import appeng.api.storage.data.IAEItemStack;

@@ -24,12 +24,12 @@
 package appeng.api.networking.crafting;


+import com.google.common.collect.ImmutableSet;
+
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.IActionHost;
 import appeng.api.storage.data.IAEItemStack;

-import com.google.common.collect.ImmutableSet;
-

 public interface ICraftingRequester extends IActionHost
 {
@@ -25,6 +25,7 @@ package appeng.api.networking.security;


 import net.minecraft.entity.player.EntityPlayer;
+
 import appeng.api.config.SecurityPermissions;
 import appeng.api.networking.IGridCache;

@@ -24,11 +24,12 @@
 package appeng.api.parts;


-import io.netty.buffer.ByteBuf;
-
 import java.io.IOException;

+import io.netty.buffer.ByteBuf;
+
 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.util.AEPartLocation;


@@ -24,12 +24,12 @@
 package appeng.api.parts;


-import io.netty.buffer.ByteBuf;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Random;

+import io.netty.buffer.ByteBuf;
+
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -42,6 +42,7 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+
 import appeng.api.networking.IGridNode;
 import appeng.api.util.AEPartLocation;
 import appeng.client.render.ModelGenerator;
@@ -31,6 +31,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.Vec3;
+
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
@@ -31,6 +31,7 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.IAESprite;

@@ -28,6 +28,7 @@ import java.util.Set;

 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
+
 import appeng.api.util.AEPartLocation;


@@ -25,6 +25,7 @@ package appeng.api.recipes;


 import net.minecraft.item.ItemStack;
+
 import appeng.api.exceptions.MissingIngredientError;
 import appeng.api.exceptions.RegistrationError;

@@ -28,6 +28,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
+
 import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.client.texture.IAESprite;

@@ -26,6 +26,7 @@ package appeng.api.storage;

 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.data.IAEItemStack;

@@ -25,6 +25,7 @@ package appeng.api.storage;


 import net.minecraft.item.ItemStack;
+
 import appeng.api.IAppEngApi;


@@ -26,6 +26,7 @@ package appeng.api.storage;

 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.FuzzyMode;


@@ -26,6 +26,7 @@ package appeng.api.storage;

 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
+
 import appeng.api.networking.security.BaseActionSource;


@@ -26,6 +26,7 @@ package appeng.api.storage;

 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
+
 import appeng.api.IAppEngApi;
 import appeng.api.networking.security.BaseActionSource;

@@ -24,13 +24,14 @@
 package appeng.api.storage;


-import io.netty.buffer.ByteBuf;
-
 import java.io.IOException;

+import io.netty.buffer.ByteBuf;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.FluidStack;
+
 import appeng.api.networking.crafting.ICraftingLink;
 import appeng.api.networking.crafting.ICraftingRequester;
 import appeng.api.networking.energy.IEnergySource;
@@ -28,14 +28,14 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map.Entry;

+import com.google.common.collect.ImmutableList;
+
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;

-import com.google.common.collect.ImmutableList;
-

 /**
 * Common implementation of a simple class that monitors injection/extraction of a inventory to send events to a list of
@@ -24,11 +24,12 @@
 package appeng.api.storage.data;


-import io.netty.buffer.ByteBuf;
-
 import java.io.IOException;

+import io.netty.buffer.ByteBuf;
+
 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.config.FuzzyMode;
 import appeng.api.storage.StorageChannel;

@@ -25,6 +25,7 @@ package appeng.api.storage.data;


 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.features.IItemComparison;


@@ -27,6 +27,7 @@ package appeng.api.util;
 import java.util.Set;

 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.config.Settings;