Organize imports

src/api/java/appeng/api/definitions/IBlockDefinition.java

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

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

@@ -25,6 +25,7 @@ package appeng.api.definitions;
 
 
 import javax.annotation.Nonnull;
+
 import com.google.common.base.Optional;
 
 import net.minecraft.item.Item;

src/api/java/appeng/api/definitions/ITileDefinition.java

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

src/api/java/appeng/api/events/LocatableEventAnnounce.java

@@ -25,6 +25,7 @@ package appeng.api.events;
 
 
 import net.minecraftforge.fml.common.eventhandler.Event;
+
 import appeng.api.features.ILocatable;
 
 

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

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

src/api/java/appeng/api/features/IP2PTunnelRegistry.java

@@ -27,6 +27,7 @@ package appeng.api.features;
 import javax.annotation.Nullable;
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.TunnelType;
 
 

src/api/java/appeng/api/features/IWirelessTermHandler.java

@@ -26,6 +26,7 @@ package appeng.api.features;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.util.IConfigManager;
 
 

src/api/java/appeng/api/implementations/ICraftingPatternItem.java

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

src/api/java/appeng/api/implementations/IUpgradeableHost.java

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

src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java

@@ -25,6 +25,7 @@ package appeng.api.implementations.guiobjects;
 
 
 import net.minecraft.inventory.IInventory;
+
 import appeng.api.networking.IGridHost;
 
 

src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java

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

src/api/java/appeng/api/implementations/items/IBiometricCard.java

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

src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java

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

src/api/java/appeng/api/implementations/items/IStorageCell.java

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

src/api/java/appeng/api/implementations/items/IUpgradeModule.java

@@ -25,6 +25,7 @@ package appeng.api.implementations.items;
 
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.Upgrades;
 
 

src/api/java/appeng/api/implementations/parts/IPartCable.java

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

src/api/java/appeng/api/implementations/tiles/IColorableTile.java

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

src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java

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

src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java

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

src/api/java/appeng/api/networking/IGridBlock.java

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

src/api/java/appeng/api/networking/IGridHost.java

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

src/api/java/appeng/api/networking/IGridNode.java

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

src/api/java/appeng/api/networking/crafting/ICraftingGrid.java

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

src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java

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

src/api/java/appeng/api/networking/crafting/ICraftingRequester.java

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

src/api/java/appeng/api/networking/security/ISecurityGrid.java

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

src/api/java/appeng/api/parts/IFacadeContainer.java

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

src/api/java/appeng/api/parts/IPart.java

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

src/api/java/appeng/api/parts/IPartHost.java

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

src/api/java/appeng/api/parts/IPartRenderHelper.java

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

src/api/java/appeng/api/parts/LayerBase.java

@@ -28,6 +28,7 @@ import java.util.Set;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
+
 import appeng.api.util.AEPartLocation;
 
 

src/api/java/appeng/api/recipes/IIngredient.java

@@ -25,6 +25,7 @@ package appeng.api.recipes;
 
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.exceptions.MissingIngredientError;
 import appeng.api.exceptions.RegistrationError;
 

src/api/java/appeng/api/storage/ICellHandler.java

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

src/api/java/appeng/api/storage/ICellInventory.java

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

src/api/java/appeng/api/storage/ICellRegistry.java

@@ -25,6 +25,7 @@ package appeng.api.storage;
 
 
 import net.minecraft.item.ItemStack;
+
 import appeng.api.IAppEngApi;
 
 

src/api/java/appeng/api/storage/ICellWorkbenchItem.java

@@ -26,6 +26,7 @@ package appeng.api.storage;
 
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+
 import appeng.api.config.FuzzyMode;
 
 

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

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

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

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

src/api/java/appeng/api/storage/IStorageHelper.java

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

src/api/java/appeng/api/storage/MEMonitorHandler.java

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

src/api/java/appeng/api/storage/data/IAEStack.java

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

src/api/java/appeng/api/storage/data/IAETagCompound.java

@@ -25,6 +25,7 @@ package appeng.api.storage.data;
 
 
 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.features.IItemComparison;
 
 

src/api/java/appeng/api/util/IConfigManager.java

@@ -27,6 +27,7 @@ package appeng.api.util;
 import java.util.Set;
 
 import net.minecraft.nbt.NBTTagCompound;
+
 import appeng.api.config.Settings;
 
 

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

@@ -23,14 +23,6 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 
-import appeng.api.util.IOrientable;
-import appeng.api.util.IOrientableBlock;
-import appeng.block.AEBaseTileBlock;
-import appeng.client.render.blocks.RenderQuartzTorch;
-import appeng.core.features.AEFeature;
-import appeng.helpers.ICustomCollision;
-import appeng.helpers.MetaRotation;
-import appeng.tile.misc.TileLightDetector;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockTorch;
 import net.minecraft.block.material.Material;
@@ -43,6 +35,15 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import appeng.api.util.IOrientable;
+import appeng.api.util.IOrientableBlock;
+import appeng.block.AEBaseTileBlock;
+import appeng.client.render.blocks.RenderQuartzTorch;
+import appeng.core.features.AEFeature;
+import appeng.helpers.ICustomCollision;
+import appeng.helpers.MetaRotation;
+import appeng.tile.misc.TileLightDetector;
+
 public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBlock, ICustomCollision
 {
 

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

@@ -22,6 +22,28 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.particle.EffectRenderer;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumDyeColor;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
 import appeng.api.parts.IPartHost;
 import appeng.api.parts.PartItemStack;
 import appeng.api.parts.SelectedPart;
@@ -45,27 +67,6 @@ import appeng.tile.AEBaseTile;
 import appeng.tile.networking.TileCableBus;
 import appeng.tile.networking.TileCableBusTESR;
 import appeng.util.Platform;
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.particle.EffectRenderer;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumDyeColor;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumWorldBlockLayer;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 // TODO: MFR INTEGRATION
 //@Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = IntegrationType.MFR )

src/main/java/appeng/client/ClientHelper.java

@@ -34,7 +34,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.ItemModelMesher;
 import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.ModelResourceLocation;
@@ -64,7 +63,6 @@ import appeng.api.util.AEColor;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
-import appeng.client.render.ModelGenerator;
 import appeng.client.render.TESRWrapper;
 import appeng.client.render.blocks.RendererCableBus;
 import appeng.client.render.effects.AssemblerFX;

src/main/java/appeng/client/SmartModel.java

@@ -4,11 +4,6 @@ package appeng.client;
 import java.util.Collections;
 import java.util.List;
 
-import appeng.api.util.AEPartLocation;
-import appeng.block.AEBaseBlock;
-import appeng.client.render.BlockRenderInfo;
-import appeng.client.render.ModelGenerator;
-import appeng.client.texture.MissingIcon;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
@@ -22,6 +17,12 @@ import net.minecraftforge.client.model.ISmartBlockModel;
 import net.minecraftforge.client.model.ISmartItemModel;
 import net.minecraftforge.common.property.IExtendedBlockState;
 
+import appeng.api.util.AEPartLocation;
+import appeng.block.AEBaseBlock;
+import appeng.client.render.BlockRenderInfo;
+import appeng.client.render.ModelGenerator;
+import appeng.client.texture.MissingIcon;
+
 // net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer
 public class SmartModel implements IBakedModel, ISmartBlockModel, ISmartItemModel
 {

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

@@ -23,8 +23,6 @@ import java.util.Random;
 
 import org.lwjgl.opengl.GL11;
 
-import com.sun.xml.internal.ws.api.streaming.XMLStreamReaderFactory.Default;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.client.renderer.GLAllocation;

src/main/java/appeng/client/render/blocks/RenderBlockCharger.java

@@ -31,11 +31,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IOrientable;
 import appeng.block.misc.BlockCharger;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;

src/main/java/appeng/client/render/blocks/RenderBlockCrank.java

@@ -30,9 +30,9 @@ import net.minecraft.client.resources.model.IBakedModel;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.block.grindstone.BlockCrank;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.tile.grindstone.TileCrank;

src/main/java/appeng/client/render/blocks/RenderBlockEnergyCube.java

@@ -22,10 +22,10 @@ package appeng.client.render.blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.block.networking.BlockEnergyCell;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.tile.networking.TileEnergyCell;

src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java

@@ -35,13 +35,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.features.IInscriberRecipe;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IOrientable;
 import appeng.block.AEBaseBlock;
 import appeng.block.misc.BlockInscriber;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;

src/main/java/appeng/client/render/blocks/RenderBlockPaint.java

@@ -25,9 +25,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.block.misc.BlockPaint;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;

src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java

@@ -30,10 +30,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.block.storage.BlockSkyChest;
 import appeng.block.storage.BlockSkyChest.SkyChestType;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.tile.storage.TileSkyChest;

src/main/java/appeng/client/render/blocks/RenderBlockSkyCompass.java

@@ -29,9 +29,9 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.block.misc.BlockSkyCompass;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.render.model.ModelCompass;

src/main/java/appeng/client/render/blocks/RenderBlockWireless.java

@@ -25,11 +25,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
 import appeng.block.networking.BlockWireless;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
 import appeng.client.render.ModelGenerator;

src/main/java/appeng/client/render/blocks/RenderDrive.java

@@ -25,10 +25,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.util.AEPartLocation;
 import appeng.block.storage.BlockDrive;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;

src/main/java/appeng/client/render/blocks/RenderMEChest.java

@@ -25,13 +25,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.AEApi;
 import appeng.api.storage.ICellHandler;
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
 import appeng.block.storage.BlockChest;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;

src/main/java/appeng/client/render/blocks/RenderNull.java

@@ -22,9 +22,9 @@ package appeng.client.render.blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.block.AEBaseBlock;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.tile.AEBaseTile;

src/main/java/appeng/client/render/blocks/RenderQNB.java

@@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.AEApi;
 import appeng.api.definitions.IBlocks;
@@ -37,6 +36,7 @@ import appeng.api.definitions.IParts;
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
 import appeng.block.qnb.BlockQuantumBase;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;

src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java

@@ -24,10 +24,10 @@ import java.util.Random;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.AEApi;
 import appeng.api.util.AEPartLocation;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;

src/main/java/appeng/client/render/blocks/RenderQuartzOre.java

@@ -22,8 +22,8 @@ package appeng.client.render.blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;

src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java

@@ -25,12 +25,12 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.IOrientable;
 import appeng.api.util.IOrientableBlock;
 import appeng.block.AEBaseBlock;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.tile.AEBaseTile;

src/main/java/appeng/client/render/blocks/RenderSpatialPylon.java

@@ -23,10 +23,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.util.AEPartLocation;
 import appeng.block.spatial.BlockSpatialPylon;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BlockRenderInfo;
 import appeng.client.render.ModelGenerator;

src/main/java/appeng/client/render/blocks/RenderTinyTNT.java

@@ -24,9 +24,9 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.block.misc.BlockTinyTNT;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.FullIcon;

src/main/java/appeng/client/render/blocks/RendererCableBus.java

@@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.parts.IFacadePart;
 import appeng.api.parts.IPart;
@@ -36,6 +35,7 @@ import appeng.api.parts.IPartItem;
 import appeng.api.util.AEPartLocation;
 import appeng.block.networking.BlockCableBus;
 import appeng.client.ClientHelper;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.BusRenderHelper;
 import appeng.client.render.BusRenderer;

src/main/java/appeng/client/render/blocks/RendererSecurity.java

@@ -25,11 +25,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
-import appeng.client.ItemRenderType;
 
 import appeng.api.util.AEColor;
 import appeng.api.util.AEPartLocation;
 import appeng.block.misc.BlockSecurity;
+import appeng.client.ItemRenderType;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.ModelGenerator;
 import appeng.client.texture.ExtraBlockTextures;

src/main/java/appeng/client/render/items/ToolBiometricCardRender.java

@@ -19,9 +19,10 @@
 package appeng.client.render.items;
 
 
-import appeng.client.ItemRenderType;
 import net.minecraft.item.ItemStack;
 
+import appeng.client.ItemRenderType;
+
 
 // TODO - PORT
 public class ToolBiometricCardRender   // TileEntityItemStackRenderer

src/main/java/appeng/client/render/items/ToolColorApplicatorRender.java

@@ -19,9 +19,10 @@
 package appeng.client.render.items;
 
 
-import appeng.client.ItemRenderType;
 import net.minecraft.item.ItemStack;
 
+import appeng.client.ItemRenderType;
+
 
 public class ToolColorApplicatorRender 
 {

src/main/java/appeng/debug/TileCubeGenerator.java

@@ -26,6 +26,7 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ITickable;
+
 import appeng.core.CommonHelper;
 import appeng.tile.AEBaseTile;
 import appeng.tile.TileEvent;

src/main/java/appeng/entity/RenderFloatingItem.java

@@ -24,7 +24,6 @@ import org.lwjgl.opengl.GL11;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.RenderEntityItem;
 import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemBlock;
 import net.minecraftforge.fml.relauncher.Side;

src/main/java/appeng/items/tools/ToolBiometricCard.java

@@ -30,13 +30,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTUtil;
 import net.minecraft.world.World;
-import net.minecraftforge.client.MinecraftForgeClient;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.api.features.IPlayerRegistry;
 import appeng.api.implementations.items.IBiometricCard;
 import appeng.api.networking.security.ISecurityRegistry;
-import appeng.client.render.items.ToolBiometricCardRender;
 import appeng.core.features.AEFeature;
 import appeng.core.localization.GuiText;
 import appeng.items.AEBaseItem;

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

@@ -47,7 +47,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.oredict.OreDictionary;
 
 import appeng.api.AEApi;
@@ -67,7 +66,6 @@ import appeng.api.util.AEColor;
 import appeng.api.util.DimensionalCoord;
 import appeng.block.misc.BlockPaint;
 import appeng.block.networking.BlockCableBus;
-import appeng.client.render.items.ToolColorApplicatorRender;
 import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import appeng.core.localization.GuiText;

src/main/java/appeng/tile/misc/TileCharger.java

@@ -31,6 +31,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ITickable;
+
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;

src/main/java/appeng/tile/misc/TileLightDetector.java

@@ -20,11 +20,12 @@ package appeng.tile.misc;
 
 
 
+import net.minecraft.util.ITickable;
+
 import appeng.tile.AEBaseTile;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
 import appeng.util.Platform;
-import net.minecraft.util.ITickable;
 
 
 public class TileLightDetector extends AEBaseTile implements ITickable

src/main/java/appeng/tile/qnb/TileQuantumBridge.java

@@ -32,6 +32,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ITickable;
+
 import appeng.api.AEApi;
 import appeng.api.definitions.IBlockDefinition;
 import appeng.api.networking.GridFlags;

src/main/java/appeng/tile/storage/TileChest.java

@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.List;
 
 import io.netty.buffer.ByteBuf;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;