Organised imports

src/api/java/appeng/api/parts/IFacadePart.java

@@ -24,8 +24,6 @@
 package appeng.api.parts;
 
 
-import javax.annotation.Nullable;
-
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;

src/main/java/appeng/block/AEBaseItemBlockChargeable.java

@@ -24,7 +24,6 @@ import java.util.List;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;

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

@@ -34,7 +34,6 @@ import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.EnumDyeColor;

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

@@ -22,7 +22,6 @@ package appeng.block.crafting;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.NonNullList;

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

@@ -18,10 +18,6 @@
 
 package appeng.block.crafting;
 
-
-import appeng.tile.crafting.TileCraftingStorageTile;
-
-
 public class BlockCraftingStorage extends BlockCraftingUnit
 {
 

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

@@ -34,9 +34,6 @@ import net.minecraft.world.World;
 import appeng.block.AEBaseTileBlock;
 import appeng.tile.networking.TileController;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 
 public class BlockController extends AEBaseTileBlock
 {

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

@@ -21,7 +21,6 @@ package appeng.block.networking;
 
 import appeng.block.AEBaseTileBlock;
 import appeng.helpers.AEGlassMaterial;
-import appeng.tile.networking.TileCreativeEnergyCell;
 
 
 public class BlockCreativeEnergyCell extends AEBaseTileBlock

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

@@ -18,10 +18,6 @@
 
 package appeng.block.networking;
 
-
-import appeng.tile.networking.TileDenseEnergyCell;
-
-
 public class BlockDenseEnergyCell extends BlockEnergyCell
 {
 

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

@@ -22,7 +22,6 @@ package appeng.block.networking;
 import net.minecraft.block.material.Material;
 
 import appeng.block.AEBaseTileBlock;
-import appeng.tile.networking.TileEnergyAcceptor;
 
 
 public class BlockEnergyAcceptor extends AEBaseTileBlock

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

@@ -23,7 +23,6 @@ import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.NonNullList;
@@ -32,7 +31,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.block.AEBaseTileBlock;
 import appeng.helpers.AEGlassMaterial;
-import appeng.tile.networking.TileEnergyCell;
 import appeng.util.Platform;
 
 

src/main/java/appeng/block/spatial/BlockMatrixFrame.java

@@ -26,7 +26,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.AxisAlignedBB;

src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java

@@ -29,8 +29,6 @@ import java.util.function.Supplier;
 
 import javax.annotation.Nullable;
 
-import appeng.bootstrap.definitions.TileEntityDefinition;
-import appeng.core.Registration;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.creativetab.CreativeTabs;
@@ -44,9 +42,11 @@ import appeng.api.definitions.IBlockDefinition;
 import appeng.block.AEBaseBlock;
 import appeng.block.AEBaseItemBlock;
 import appeng.block.AEBaseTileBlock;
+import appeng.bootstrap.definitions.TileEntityDefinition;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
 import appeng.core.CreativeTab;
+import appeng.core.Registration;
 import appeng.core.features.AEFeature;
 import appeng.core.features.ActivityState;
 import appeng.core.features.BlockDefinition;

src/main/java/appeng/bootstrap/FeatureFactory.java

@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 
-import appeng.bootstrap.components.*;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraftforge.client.model.IModel;
@@ -33,6 +32,13 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 import appeng.api.definitions.IItemDefinition;
 import appeng.api.util.AEColor;
 import appeng.api.util.AEColoredItemDefinition;
+import appeng.bootstrap.components.BuiltInModelComponent;
+import appeng.bootstrap.components.InitComponent;
+import appeng.bootstrap.components.ModelOverrideComponent;
+import appeng.bootstrap.components.ModelRegComponent;
+import appeng.bootstrap.components.PostInitComponent;
+import appeng.bootstrap.components.PreInitComponent;
+import appeng.bootstrap.components.TileEntityComponent;
 import appeng.core.features.AEFeature;
 import appeng.core.features.ActivityState;
 import appeng.core.features.ColoredItemDefinition;

src/main/java/appeng/bootstrap/IBlockBuilder.java

@@ -22,12 +22,12 @@ package appeng.bootstrap;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
-import appeng.bootstrap.definitions.TileEntityDefinition;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 
 import appeng.api.definitions.IBlockDefinition;
+import appeng.bootstrap.definitions.TileEntityDefinition;
 import appeng.core.features.AEFeature;
 
 

src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java

@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import appeng.core.Registration;
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.dispenser.IBehaviorDispenseItem;
@@ -37,6 +36,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
 import appeng.core.CreativeTab;
+import appeng.core.Registration;
 import appeng.core.features.AEFeature;
 import appeng.core.features.ItemDefinition;
 import appeng.util.Platform;

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

@@ -2,9 +2,10 @@
 package appeng.bootstrap.components;
 
 
-import appeng.bootstrap.IBootstrapComponent;
 import net.minecraftforge.fml.relauncher.Side;
 
+import appeng.bootstrap.IBootstrapComponent;
+
 
 /**
  * @author GuntherDW

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

@@ -2,13 +2,14 @@
 package appeng.bootstrap.components;
 
 
-import appeng.bootstrap.definitions.TileEntityDefinition;
+import java.util.ArrayList;
-import appeng.core.AppEng;
+import java.util.List;
+
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 
-import java.util.ArrayList;
+import appeng.bootstrap.definitions.TileEntityDefinition;
-import java.util.List;
+import appeng.core.AppEng;
 
 
 /**

src/main/java/appeng/client/gui/AEBaseGui.java

@@ -35,7 +35,6 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
 
-import net.minecraft.client.renderer.BufferBuilder;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -43,6 +42,7 @@ import org.lwjgl.opengl.GL11;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;

src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java

@@ -22,12 +22,11 @@ package appeng.client.gui.implementations;
 import java.io.IOException;
 import java.util.List;
 
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraftforge.fml.client.FMLClientHandler;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;

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

@@ -21,11 +21,11 @@ package appeng.client.render;
 
 import java.util.Random;
 
-import net.minecraft.client.renderer.BufferBuilder;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;

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

@@ -9,8 +9,6 @@ import javax.vecmath.Matrix4f;
 
 import com.google.common.collect.ImmutableMap;
 
-import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.client.model.PerspectiveMapWrapper;
 import org.apache.commons.lang3.tuple.Pair;
 import org.lwjgl.input.Keyboard;
 
@@ -26,6 +24,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
+import net.minecraftforge.client.model.PerspectiveMapWrapper;
 import net.minecraftforge.common.model.TRSRTransformation;
 
 import appeng.items.misc.ItemEncodedPattern;

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

@@ -15,7 +15,6 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableList;
 import com.mojang.authlib.GameProfile;
 
-import net.minecraftforge.client.model.IModel;
 import org.apache.commons.lang3.tuple.Pair;
 
 import net.minecraft.block.state.IBlockState;
@@ -29,6 +28,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
+import net.minecraftforge.client.model.IModel;
 import net.minecraftforge.common.model.TRSRTransformation;
 
 import appeng.api.implementations.items.IBiometricCard;

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

@@ -11,7 +11,6 @@ import javax.vecmath.Matrix4f;
 
 import com.google.common.collect.ImmutableMap;
 
-import net.minecraftforge.client.model.PerspectiveMapWrapper;
 import org.apache.commons.lang3.tuple.Pair;
 
 import net.minecraft.block.state.IBlockState;
@@ -21,6 +20,7 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.block.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.EnumFacing;
+import net.minecraftforge.client.model.PerspectiveMapWrapper;
 import net.minecraftforge.common.model.TRSRTransformation;
 
 

src/main/java/appeng/client/render/renderable/ItemRenderable.java

@@ -22,12 +22,12 @@ package appeng.client.render.renderable;
 import java.nio.FloatBuffer;
 import java.util.function.Function;
 
-import net.minecraft.client.renderer.BufferBuilder;
 import org.apache.commons.lang3.tuple.Pair;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.util.vector.Matrix4f;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
 import net.minecraft.item.ItemStack;

src/main/java/appeng/client/render/tesr/CrankTESR.java

@@ -19,12 +19,12 @@
 package appeng.client.render.tesr;
 
 
-import net.minecraft.client.renderer.BufferBuilder;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;

src/main/java/appeng/client/render/tesr/InscriberTESR.java

@@ -2,12 +2,11 @@
 package appeng.client.render.tesr;
 
 
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.init.Blocks;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
@@ -16,6 +15,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.TextureStitchEvent;

src/main/java/appeng/container/implementations/ContainerNetworkStatus.java

@@ -24,7 +24,6 @@ import java.io.IOException;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.AEApi;

src/main/java/appeng/container/slot/AppEngCraftingSlot.java

@@ -20,16 +20,9 @@ package appeng.container.slot;
 
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemHoe;
-import net.minecraft.item.ItemPickaxe;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemSword;
-import net.minecraft.item.ItemTool;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.util.NonNullList;
 

src/main/java/appeng/container/slot/AppEngSlot.java

@@ -19,17 +19,17 @@
 package appeng.container.slot;
 
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-
-import appeng.container.AEBaseContainer;
-import appeng.tile.inventory.AppEngInternalInventory;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
+import appeng.container.AEBaseContainer;
+import appeng.tile.inventory.AppEngInternalInventory;
 
 
 public class AppEngSlot extends Slot

src/main/java/appeng/container/slot/NullSlot.java

@@ -19,13 +19,13 @@
 package appeng.container.slot;
 
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class NullSlot extends Slot
 {

src/main/java/appeng/container/slot/OptionalSlotFake.java

@@ -19,11 +19,11 @@
 package appeng.container.slot;
 
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-
 
 public class OptionalSlotFake extends SlotFake
 {

src/main/java/appeng/core/ApiDefinitions.java

@@ -26,11 +26,6 @@ import appeng.core.api.definitions.ApiItems;
 import appeng.core.api.definitions.ApiMaterials;
 import appeng.core.api.definitions.ApiParts;
 import appeng.core.features.registries.PartModels;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.world.biome.Biome;
-import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 
 /**

src/main/java/appeng/core/FacadeConfig.java

@@ -25,7 +25,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.config.Configuration;

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

@@ -27,10 +27,6 @@ import java.util.Set;
 
 import javax.annotation.Nonnull;
 
-import appeng.integration.IntegrationRegistry;
-import appeng.integration.IntegrationType;
-import appeng.items.parts.ItemFacade;
-import appeng.recipes.game.DisassembleRecipe;
 import com.google.common.base.Preconditions;
 
 import net.minecraft.block.Block;
@@ -50,6 +46,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.oredict.RecipeSorter;
 import net.minecraftforge.oredict.RecipeSorter.Category;
+import net.minecraftforge.registries.IForgeRegistry;
 
 import appeng.api.config.Upgrades;
 import appeng.api.definitions.IBlocks;
@@ -78,8 +75,11 @@ import appeng.core.localization.GuiText;
 import appeng.core.localization.PlayerMessages;
 import appeng.core.stats.PlayerStatsRegistration;
 import appeng.hooks.TickHandler;
+import appeng.integration.IntegrationRegistry;
+import appeng.integration.IntegrationType;
 import appeng.integration.Integrations;
 import appeng.items.materials.ItemMaterial;
+import appeng.items.parts.ItemFacade;
 import appeng.loot.ChestLoot;
 import appeng.me.cache.CraftingGridCache;
 import appeng.me.cache.EnergyGridCache;
@@ -93,6 +93,7 @@ import appeng.parts.PartPlacement;
 import appeng.recipes.AEItemResolver;
 import appeng.recipes.CustomRecipeConfig;
 import appeng.recipes.RecipeHandler;
+import appeng.recipes.game.DisassembleRecipe;
 import appeng.recipes.game.FacadeRecipe;
 import appeng.recipes.game.ShapedRecipe;
 import appeng.recipes.game.ShapelessRecipe;
@@ -114,8 +115,6 @@ import appeng.spatial.StorageWorldProvider;
 import appeng.tile.AEBaseTile;
 import appeng.worldgen.MeteoriteWorldGen;
 import appeng.worldgen.QuartzWorldGen;
-import net.minecraftforge.registries.IForgeRegistry;
-import scala.App;
 
 
 public final class Registration

src/main/java/appeng/core/api/definitions/ApiBlocks.java

@@ -19,41 +19,6 @@
 package appeng.core.api.definitions;
 
 
-import appeng.bootstrap.definitions.TileEntityDefinition;
-import appeng.debug.TileChunkLoader;
-import appeng.debug.TileCubeGenerator;
-import appeng.debug.TileItemGen;
-import appeng.debug.TilePhantomNode;
-import appeng.tile.crafting.TileCraftingMonitorTile;
-import appeng.tile.crafting.TileCraftingStorageTile;
-import appeng.tile.crafting.TileCraftingTile;
-import appeng.tile.crafting.TileMolecularAssembler;
-import appeng.tile.grindstone.TileCrank;
-import appeng.tile.grindstone.TileGrinder;
-import appeng.tile.misc.TileCellWorkbench;
-import appeng.tile.misc.TileCharger;
-import appeng.tile.misc.TileCondenser;
-import appeng.tile.misc.TileInscriber;
-import appeng.tile.misc.TileInterface;
-import appeng.tile.misc.TileLightDetector;
-import appeng.tile.misc.TilePaint;
-import appeng.tile.misc.TileQuartzGrowthAccelerator;
-import appeng.tile.misc.TileSecurityStation;
-import appeng.tile.misc.TileSkyCompass;
-import appeng.tile.misc.TileVibrationChamber;
-import appeng.tile.networking.TileController;
-import appeng.tile.networking.TileCreativeEnergyCell;
-import appeng.tile.networking.TileDenseEnergyCell;
-import appeng.tile.networking.TileEnergyAcceptor;
-import appeng.tile.networking.TileEnergyCell;
-import appeng.tile.networking.TileWireless;
-import appeng.tile.qnb.TileQuantumBridge;
-import appeng.tile.spatial.TileSpatialIOPort;
-import appeng.tile.spatial.TileSpatialPylon;
-import appeng.tile.storage.TileChest;
-import appeng.tile.storage.TileDrive;
-import appeng.tile.storage.TileIOPort;
-import appeng.tile.storage.TileSkyChest;
 import com.google.common.base.Verify;
 
 import net.minecraft.block.Block;
@@ -63,9 +28,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemSlab;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.oredict.OreDictionary;
@@ -130,6 +93,7 @@ import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.FeatureFactory;
 import appeng.bootstrap.IBlockRendering;
 import appeng.bootstrap.IItemRendering;
+import appeng.bootstrap.definitions.TileEntityDefinition;
 import appeng.client.render.crafting.CraftingCubeRendering;
 import appeng.client.render.model.GlassModel;
 import appeng.client.render.spatial.SpatialPylonRendering;
@@ -141,6 +105,10 @@ import appeng.debug.BlockChunkloader;
 import appeng.debug.BlockCubeGenerator;
 import appeng.debug.BlockItemGen;
 import appeng.debug.BlockPhantomNode;
+import appeng.debug.TileChunkLoader;
+import appeng.debug.TileCubeGenerator;
+import appeng.debug.TileItemGen;
+import appeng.debug.TilePhantomNode;
 import appeng.decorative.slab.BlockSlabCommon;
 import appeng.decorative.solid.BlockChargedQuartzOre;
 import appeng.decorative.solid.BlockChiseledQuartz;
@@ -154,6 +122,36 @@ import appeng.decorative.solid.BlockSkyStone;
 import appeng.decorative.solid.BlockSkyStone.SkystoneType;
 import appeng.decorative.stair.BlockStairCommon;
 import appeng.hooks.DispenserBehaviorTinyTNT;
+import appeng.tile.crafting.TileCraftingMonitorTile;
+import appeng.tile.crafting.TileCraftingStorageTile;
+import appeng.tile.crafting.TileCraftingTile;
+import appeng.tile.crafting.TileMolecularAssembler;
+import appeng.tile.grindstone.TileCrank;
+import appeng.tile.grindstone.TileGrinder;
+import appeng.tile.misc.TileCellWorkbench;
+import appeng.tile.misc.TileCharger;
+import appeng.tile.misc.TileCondenser;
+import appeng.tile.misc.TileInscriber;
+import appeng.tile.misc.TileInterface;
+import appeng.tile.misc.TileLightDetector;
+import appeng.tile.misc.TilePaint;
+import appeng.tile.misc.TileQuartzGrowthAccelerator;
+import appeng.tile.misc.TileSecurityStation;
+import appeng.tile.misc.TileSkyCompass;
+import appeng.tile.misc.TileVibrationChamber;
+import appeng.tile.networking.TileController;
+import appeng.tile.networking.TileCreativeEnergyCell;
+import appeng.tile.networking.TileDenseEnergyCell;
+import appeng.tile.networking.TileEnergyAcceptor;
+import appeng.tile.networking.TileEnergyCell;
+import appeng.tile.networking.TileWireless;
+import appeng.tile.qnb.TileQuantumBridge;
+import appeng.tile.spatial.TileSpatialIOPort;
+import appeng.tile.spatial.TileSpatialPylon;
+import appeng.tile.storage.TileChest;
+import appeng.tile.storage.TileDrive;
+import appeng.tile.storage.TileIOPort;
+import appeng.tile.storage.TileSkyChest;
 
 
 /**

src/main/java/appeng/core/stats/PlayerStatsRegistration.java

@@ -19,7 +19,6 @@
 package appeng.core.stats;
 
 
-import net.minecraft.advancements.Advancement;
 import net.minecraftforge.fml.common.eventhandler.EventBus;
 
 import appeng.core.AEConfig;

src/main/java/appeng/coremod/AppEngCore.java

@@ -25,6 +25,8 @@ import javax.annotation.Nullable;
 
 import com.google.common.eventbus.EventBus;
 
+import org.apache.logging.log4j.Level;
+
 import net.minecraftforge.fml.common.DummyModContainer;
 import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.LoadController;
@@ -35,7 +37,6 @@ import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 
 import appeng.core.AEConfig;
-import org.apache.logging.log4j.Level;
 
 
 @MCVersion( "1.12" )

src/main/java/appeng/coremod/transformer/ASMIntegration.java

@@ -23,7 +23,6 @@ import java.util.Iterator;
 
 import javax.annotation.Nullable;
 
-import net.minecraftforge.fml.common.FMLLog;
 import org.apache.logging.log4j.Level;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
@@ -33,6 +32,7 @@ import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
 import net.minecraft.launchwrapper.IClassTransformer;
+import net.minecraftforge.fml.common.FMLLog;
 
 import appeng.coremod.annotations.Integration;
 import appeng.helpers.Reflected;

src/main/java/appeng/entity/EntityTinyTNTPrimed.java

@@ -29,7 +29,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.MoverType;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.item.EntityTNTPrimed;
-import net.minecraft.init.Blocks;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumParticleTypes;

src/main/java/appeng/facade/FacadePart.java

@@ -19,8 +19,6 @@
 package appeng.facade;
 
 
-import javax.annotation.Nullable;
-
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;

src/main/java/appeng/integration/IntegrationNode.java

@@ -25,8 +25,6 @@ import net.minecraftforge.fml.common.ModAPIManager;
 import appeng.api.exceptions.ModNotInstalled;
 import appeng.core.AEConfig;
 import appeng.core.AELog;
-//import appeng.integration.modules.ic2.IC2Module;
-import appeng.integration.modules.jei.JEIModule;
 
 
 final class IntegrationNode

src/main/java/appeng/integration/Integrations.java

@@ -19,7 +19,12 @@
 package appeng.integration;
 
 
-import appeng.integration.abstraction.*;
+import appeng.integration.abstraction.IIC2;
+import appeng.integration.abstraction.IInvTweaks;
+import appeng.integration.abstraction.IJEI;
+import appeng.integration.abstraction.IMekanism;
+import appeng.integration.abstraction.IRC;
+import appeng.integration.abstraction.IRF;
 
 
 /**

src/main/java/appeng/integration/modules/ic2/IC2RecipeInput.java

@@ -19,13 +19,15 @@
 package appeng.integration.modules.ic2;
 
 
-import ic2.api.recipe.IRecipeInput;
-import net.minecraft.item.ItemStack;
-
-import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
+import net.minecraft.item.ItemStack;
+
+import ic2.api.recipe.IRecipeInput;
+
 
 /**
  * Implementation of IRecipeInput for the macerator recipe.

src/main/java/appeng/integration/modules/jei/JEIPlugin.java

@@ -45,7 +45,6 @@ import appeng.container.implementations.ContainerPatternTerm;
 import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 import appeng.core.localization.GuiText;
-import appeng.integration.Integrations;
 import appeng.items.parts.ItemFacade;
 
 

src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeModule.java

@@ -19,6 +19,8 @@
 package appeng.integration.modules.theoneprobe;
 
 
+import java.util.function.Function;
+
 import net.minecraftforge.fml.common.event.FMLInterModComms;
 
 import mcjty.theoneprobe.api.ITheOneProbe;
@@ -26,8 +28,6 @@ import mcjty.theoneprobe.api.ITheOneProbe;
 import appeng.integration.IIntegrationModule;
 import appeng.integration.modules.theoneprobe.config.AEConfigProvider;
 
-import java.util.function.Function;
-
 
 public class TheOneProbeModule implements IIntegrationModule, Function<ITheOneProbe, Void>
 {

src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java

@@ -21,6 +21,8 @@ package appeng.integration.modules.waila.tile;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
@@ -35,8 +37,6 @@ import appeng.core.localization.WailaText;
 import appeng.integration.modules.waila.BaseWailaDataProvider;
 import appeng.tile.misc.TileCharger;
 
-import javax.annotation.Nonnull;
-
 
 /**
  * Charger provider for WAILA

src/main/java/appeng/items/AEBaseItem.java

@@ -23,7 +23,6 @@ import java.util.List;
 
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;

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

@@ -29,13 +29,14 @@ import net.minecraft.block.material.Material;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.registry.EntityRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.AEApi;
 import appeng.api.definitions.IMaterials;
@@ -47,8 +48,6 @@ import appeng.entity.EntityGrowingCrystal;
 import appeng.entity.EntityIds;
 import appeng.items.AEBaseItem;
 import appeng.util.Platform;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal

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

@@ -34,6 +34,8 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.AEApi;
 import appeng.api.implementations.ICraftingPatternItem;
@@ -44,8 +46,6 @@ import appeng.core.localization.GuiText;
 import appeng.helpers.PatternHelper;
 import appeng.items.AEBaseItem;
 import appeng.util.Platform;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternItem

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

@@ -20,7 +20,6 @@ package appeng.items.misc;
 
 
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 

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

@@ -28,8 +28,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import appeng.integration.IntegrationHelper;
-import appeng.parts.p2p.*;
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -61,6 +59,14 @@ import appeng.parts.networking.PartCableGlass;
 import appeng.parts.networking.PartCableSmart;
 import appeng.parts.networking.PartDenseCable;
 import appeng.parts.networking.PartQuartzFiber;
+import appeng.parts.p2p.PartP2PFEPower;
+import appeng.parts.p2p.PartP2PFluids;
+import appeng.parts.p2p.PartP2PIC2Power;
+import appeng.parts.p2p.PartP2PItems;
+import appeng.parts.p2p.PartP2PLight;
+import appeng.parts.p2p.PartP2PRFPower;
+import appeng.parts.p2p.PartP2PRedstone;
+import appeng.parts.p2p.PartP2PTunnelME;
 import appeng.parts.reporting.PartConversionMonitor;
 import appeng.parts.reporting.PartCraftingTerminal;
 import appeng.parts.reporting.PartDarkPanel;

src/main/java/appeng/items/storage/ItemBasicStorageCell.java

@@ -33,6 +33,8 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.AEApi;
 import appeng.api.config.FuzzyMode;
@@ -56,8 +58,6 @@ import appeng.items.contents.CellUpgrades;
 import appeng.items.materials.MaterialType;
 import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, IItemGroup

src/main/java/appeng/items/storage/ItemCreativeStorageCell.java

@@ -19,24 +19,23 @@
 package appeng.items.storage;
 
 
-import appeng.api.AEApi;
+import java.util.List;
-import appeng.api.storage.ICellInventoryHandler;
+
-import appeng.api.storage.IMEInventoryHandler;
-import appeng.api.storage.StorageChannel;
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-
-import appeng.api.config.FuzzyMode;
-import appeng.api.storage.ICellWorkbenchItem;
-import appeng.items.AEBaseItem;
-import appeng.items.contents.CellConfig;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.util.List;
+import appeng.api.AEApi;
+import appeng.api.config.FuzzyMode;
+import appeng.api.storage.ICellInventoryHandler;
+import appeng.api.storage.ICellWorkbenchItem;
+import appeng.api.storage.IMEInventoryHandler;
+import appeng.api.storage.StorageChannel;
+import appeng.items.AEBaseItem;
+import appeng.items.contents.CellConfig;
 
 
 public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenchItem

src/main/java/appeng/items/storage/ItemSpatialStorageCell.java

@@ -22,11 +22,12 @@ package appeng.items.storage;
 import java.util.List;
 
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.implementations.TransitionResult;
 import appeng.api.implementations.items.ISpatialStorageCell;
@@ -37,8 +38,6 @@ import appeng.items.AEBaseItem;
 import appeng.spatial.StorageHelper;
 import appeng.spatial.StorageWorldProvider;
 import appeng.util.Platform;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorageCell

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

@@ -34,6 +34,8 @@ import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.api.features.IPlayerRegistry;
@@ -42,8 +44,6 @@ import appeng.api.networking.security.ISecurityRegistry;
 import appeng.core.localization.GuiText;
 import appeng.items.AEBaseItem;
 import appeng.util.Platform;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 public class ToolBiometricCard extends AEBaseItem implements IBiometricCard

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

@@ -32,6 +32,8 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.implementations.items.IMemoryCard;
 import appeng.api.implementations.items.MemoryCardMessages;
@@ -39,8 +41,6 @@ import appeng.core.localization.GuiText;
 import appeng.core.localization.PlayerMessages;
 import appeng.items.AEBaseItem;
 import appeng.util.Platform;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 public class ToolMemoryCard extends AEBaseItem implements IMemoryCard

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

@@ -27,6 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.commons.lang3.text.WordUtils;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockColored;
 import net.minecraft.block.BlockStainedGlass;
@@ -80,7 +82,6 @@ import appeng.tile.misc.TilePaint;
 import appeng.util.ItemSorters;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
-import org.apache.commons.lang3.text.WordUtils;
 
 
 public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem

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

@@ -44,6 +44,8 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.AEApi;
 import appeng.api.config.Actionable;
@@ -78,8 +80,6 @@ import appeng.me.storage.CellInventoryHandler;
 import appeng.tile.misc.TilePaint;
 import appeng.util.LookDirection;
 import appeng.util.Platform;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell

src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java

@@ -29,6 +29,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.PowerUnits;
@@ -36,8 +38,6 @@ import appeng.api.implementations.items.IAEItemPowerStorage;
 import appeng.core.localization.GuiText;
 import appeng.items.AEBaseItem;
 import appeng.util.Platform;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPowerStorage

src/main/java/appeng/me/cache/CraftingGridCache.java

@@ -36,7 +36,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
 
-import appeng.api.networking.IMachineSet;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;

src/main/java/appeng/me/cache/PathGridCache.java

@@ -53,7 +53,6 @@ import appeng.me.pathfinding.ControllerValidator;
 import appeng.me.pathfinding.IPathItem;
 import appeng.me.pathfinding.PathSegment;
 import appeng.tile.networking.TileController;
-import appeng.util.Platform;
 
 
 public class PathGridCache implements IPathingGrid

src/main/java/appeng/parts/layers/LayerIEnergyHandler.java

@@ -19,13 +19,15 @@
 package appeng.parts.layers;
 
 
-import appeng.api.parts.IPart;
+import net.minecraft.util.EnumFacing;
-import appeng.api.parts.LayerBase;
+
 import cofh.redstoneflux.api.IEnergyConnection;
 import cofh.redstoneflux.api.IEnergyHandler;
 import cofh.redstoneflux.api.IEnergyProvider;
 import cofh.redstoneflux.api.IEnergyReceiver;
-import net.minecraft.util.EnumFacing;
+
+import appeng.api.parts.IPart;
+import appeng.api.parts.LayerBase;
 
 
 public class LayerIEnergyHandler extends LayerBase implements IEnergyHandler, IEnergyReceiver, IEnergyProvider

src/main/java/appeng/parts/misc/PartStorageBus.java

@@ -73,7 +73,6 @@ import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
-import appeng.core.stats.Achievements;
 import appeng.core.sync.GuiBridge;
 import appeng.helpers.IInterfaceHost;
 import appeng.helpers.IPriorityHost;

src/main/java/appeng/parts/p2p/PartP2PFEPower.java

@@ -21,11 +21,11 @@
 package appeng.parts.p2p;
 
 
-import appeng.api.config.PowerUnits;
+import java.util.List;
-import appeng.api.parts.IPartModel;
+
-import appeng.items.parts.PartModels;
+import javax.annotation.Nonnull;
-import appeng.me.GridAccessException;
+import javax.annotation.Nullable;
-import appeng.util.Platform;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
@@ -33,9 +33,11 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
 
-import javax.annotation.Nonnull;
+import appeng.api.config.PowerUnits;
-import javax.annotation.Nullable;
+import appeng.api.parts.IPartModel;
-import java.util.List;
+import appeng.items.parts.PartModels;
+import appeng.me.GridAccessException;
+import appeng.util.Platform;
 
 
 /**

src/main/java/appeng/parts/p2p/PartP2PItems.java

@@ -22,7 +22,8 @@ package appeng.parts.p2p;
 import java.util.LinkedList;
 import java.util.List;
 
-import appeng.util.inv.AdaptorIInventory;
+import javax.annotation.Nonnull;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
@@ -31,6 +32,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.text.ITextComponent;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.events.MENetworkBootingStatusChange;
@@ -47,13 +51,9 @@ import appeng.me.GridAccessException;
 import appeng.me.cache.helpers.TunnelCollection;
 import appeng.tile.inventory.AppEngNullInventory;
 import appeng.util.Platform;
+import appeng.util.inv.AdaptorIInventory;
 import appeng.util.inv.WrapperChainedInventory;
 import appeng.util.inv.WrapperMCISidedInventory;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
-
-import javax.annotation.Nonnull;
 
 
 // TODO: BC Integration

src/main/java/appeng/parts/p2p/PartP2PRFPower.java

@@ -20,23 +20,23 @@ package appeng.parts.p2p;
 
 
 import java.util.List;
-import java.util.Stack;
 
-import appeng.api.parts.IPartModel;
-import appeng.items.parts.PartModels;
-import cofh.redstoneflux.api.IEnergyReceiver;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-
-import appeng.api.config.PowerUnits;
-import appeng.integration.IntegrationType;
-import appeng.me.GridAccessException;
-import appeng.coremod.annotations.Integration.Interface;
-import appeng.coremod.annotations.Integration.InterfaceList;
-import appeng.util.Platform;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 
+import cofh.redstoneflux.api.IEnergyReceiver;
+
+import appeng.api.config.PowerUnits;
+import appeng.api.parts.IPartModel;
+import appeng.coremod.annotations.Integration.Interface;
+import appeng.coremod.annotations.Integration.InterfaceList;
+import appeng.integration.IntegrationType;
+import appeng.items.parts.PartModels;
+import appeng.me.GridAccessException;
+import appeng.util.Platform;
+
 
 @InterfaceList( value = { @Interface( iface = "cofh.redstoneflux.api.IEnergyReceiver", iname = IntegrationType.RF ) } )
 public final class PartP2PRFPower extends PartP2PTunnel<PartP2PRFPower> implements IEnergyReceiver

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

@@ -23,8 +23,13 @@ import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.function.BooleanSupplier;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -33,8 +38,8 @@ import javax.annotation.Nonnull;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
-
 import com.google.gson.JsonObject;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.JsonUtils;
@@ -45,8 +50,6 @@ import net.minecraftforge.common.crafting.JsonContext;
 import net.minecraftforge.fml.common.LoaderState;
 
 import appeng.api.AEApi;
-import appeng.api.recipes.*;
-import appeng.core.Api;
 import appeng.api.definitions.IBlocks;
 import appeng.api.definitions.IDefinitions;
 import appeng.api.definitions.IItems;
@@ -54,8 +57,15 @@ import appeng.api.exceptions.MissingIngredientError;
 import appeng.api.exceptions.RecipeError;
 import appeng.api.exceptions.RegistrationError;
 import appeng.api.features.IRecipeHandlerRegistry;
+import appeng.api.recipes.ICraftHandler;
+import appeng.api.recipes.IIngredient;
+import appeng.api.recipes.IRecipeHandler;
+import appeng.api.recipes.IRecipeLoader;
+import appeng.api.recipes.ResolverResult;
+import appeng.api.recipes.ResolverResultSet;
 import appeng.core.AEConfig;
 import appeng.core.AELog;
+import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.core.features.AEFeature;
 import appeng.items.materials.ItemMaterial;

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

@@ -31,7 +31,6 @@ import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 

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

@@ -26,7 +26,6 @@ import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 

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

@@ -27,7 +27,6 @@ import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.oredict.OreDictionary;
@@ -36,8 +35,6 @@ import appeng.api.exceptions.MissingIngredientError;
 import appeng.api.exceptions.RegistrationError;
 import appeng.api.recipes.IIngredient;
 
-import javax.annotation.Nullable;
-
 
 public class ShapedRecipe extends net.minecraftforge.registries.IForgeRegistryEntry.Impl<IRecipe> implements IRecipe, IRecipeBakeable
 {

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

@@ -25,7 +25,6 @@ import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.oredict.OreDictionary;
@@ -34,8 +33,6 @@ import appeng.api.exceptions.MissingIngredientError;
 import appeng.api.exceptions.RegistrationError;
 import appeng.api.recipes.IIngredient;
 
-import javax.annotation.Nullable;
-
 
 public class ShapelessRecipe extends net.minecraftforge.registries.IForgeRegistryEntry.Impl<IRecipe> implements IRecipe, IRecipeBakeable
 {

src/main/java/appeng/recipes/handlers/Shaped.java

@@ -22,7 +22,6 @@ package appeng.recipes.handlers;
 import java.util.ArrayList;
 import java.util.List;
 
-import appeng.core.Registration;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.exceptions.MissingIngredientError;
@@ -32,7 +31,6 @@ import appeng.api.recipes.ICraftHandler;
 import appeng.api.recipes.IIngredient;
 import appeng.core.AELog;
 import appeng.recipes.RecipeHandler;
-import appeng.recipes.game.ShapedRecipe;
 import appeng.util.Platform;
 
 

src/main/java/appeng/recipes/handlers/Shapeless.java

@@ -22,7 +22,6 @@ package appeng.recipes.handlers;
 import java.util.ArrayList;
 import java.util.List;
 
-import appeng.core.Registration;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.exceptions.MissingIngredientError;
@@ -32,7 +31,6 @@ import appeng.api.recipes.ICraftHandler;
 import appeng.api.recipes.IIngredient;
 import appeng.core.AELog;
 import appeng.recipes.RecipeHandler;
-import appeng.recipes.game.ShapelessRecipe;
 import appeng.util.Platform;
 
 

src/main/java/appeng/recipes/helpers/PartRecipeFactory.java

@@ -19,9 +19,9 @@
 package appeng.recipes.helpers;
 
 
-import appeng.core.AppEng;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
+
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.JsonUtils;
 import net.minecraft.util.ResourceLocation;
@@ -29,6 +29,8 @@ import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.common.crafting.IRecipeFactory;
 import net.minecraftforge.common.crafting.JsonContext;
 
+import appeng.core.AppEng;
+
 
 /**
  * @author GuntherDW

src/main/java/appeng/recipes/helpers/PartShapedCraftingFactory.java

@@ -19,16 +19,18 @@
 package appeng.recipes.helpers;
 
 
-import appeng.api.recipes.ResolverResult;
+import java.util.Map;
-import appeng.core.AELog;
+import java.util.Set;
-import appeng.core.Api;
+
-import appeng.core.AppEng;
+import javax.annotation.Nonnull;
+
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
@@ -39,9 +41,10 @@ import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.common.crafting.JsonContext;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 
-import javax.annotation.Nonnull;
+import appeng.api.recipes.ResolverResult;
-import java.util.Map;
+import appeng.core.AELog;
-import java.util.Set;
+import appeng.core.Api;
+import appeng.core.AppEng;
 
 
 /**

src/main/java/appeng/recipes/helpers/PartShapelessCraftingFactory.java

@@ -19,15 +19,13 @@
 package appeng.recipes.helpers;
 
 
-import appeng.api.recipes.ResolverResult;
+import javax.annotation.Nonnull;
-import appeng.api.recipes.ResolverResultSet;
+
-import appeng.core.AELog;
-import appeng.core.Api;
-import appeng.core.AppEng;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonSyntaxException;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
@@ -38,7 +36,10 @@ import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.common.crafting.JsonContext;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
-import javax.annotation.Nonnull;
+import appeng.api.recipes.ResolverResult;
+import appeng.core.AELog;
+import appeng.core.Api;
+import appeng.core.AppEng;
 
 
 /**

src/main/java/appeng/recipes/ores/OreDictionaryHandler.java

@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
 import net.minecraftforge.oredict.OreDictionary;

src/main/java/appeng/services/export/ExportProcess.java

@@ -21,7 +21,6 @@ package appeng.services.export;
 
 import java.io.File;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nonnull;
@@ -32,11 +31,10 @@ import com.google.common.base.Stopwatch;
 import net.minecraft.item.Item;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.ModContainer;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
+import net.minecraftforge.registries.IForgeRegistry;
 
 import appeng.core.AELog;
-import net.minecraftforge.fml.common.registry.ForgeRegistries;
-import net.minecraftforge.registries.GameData;
-import net.minecraftforge.registries.IForgeRegistry;
 
 
 /**

src/main/java/appeng/services/export/MinecraftItemCSVExporter.java

@@ -36,8 +36,6 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 
-import net.minecraftforge.fml.common.registry.ForgeRegistries;
-import net.minecraftforge.registries.IForgeRegistry;
 import org.apache.commons.io.FileUtils;
 
 import net.minecraft.block.Block;
@@ -47,6 +45,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.text.translation.I18n;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
+import net.minecraftforge.registries.IForgeRegistry;
 
 import appeng.core.AELog;
 

src/main/java/appeng/spatial/StorageChunkProvider.java

@@ -28,10 +28,10 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.gen.ChunkGeneratorOverworld;
 
 import appeng.api.AEApi;
 import appeng.core.AppEng;
-import net.minecraft.world.gen.ChunkGeneratorOverworld;
 
 
 public class StorageChunkProvider extends ChunkGeneratorOverworld

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

@@ -25,7 +25,6 @@ import java.util.List;
 
 import javax.annotation.Nullable;
 
-import appeng.util.item.AEFluidStack;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -41,6 +40,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.FluidTankProperties;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
+
 import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
@@ -96,6 +96,7 @@ import appeng.tile.inventory.InvOperation;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import appeng.util.item.AEFluidStack;
 
 
 public class TileChest extends AENetworkPowerTile implements IMEChest, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile, ITickable

src/main/java/appeng/util/Platform.java

@@ -73,7 +73,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.common.util.FakePlayerFactory;
-import net.minecraftforge.fml.client.FMLClientHandler;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.ModContainer;
@@ -81,6 +80,7 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.registries.IForgeRegistry;
 
 import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
@@ -134,7 +134,6 @@ import appeng.util.helpers.ItemComparisonHelper;
 import appeng.util.item.AEItemStack;
 import appeng.util.item.AESharedNBT;
 import appeng.util.prioritylist.IPartitionList;
-import net.minecraftforge.registries.IForgeRegistry;
 
 
 /**

src/main/java/appeng/util/helpers/ItemComparisonHelper.java

@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;

src/main/java/appeng/util/inv/AdaptorIInventory.java

@@ -22,7 +22,6 @@ package appeng.util.inv;
 import java.util.Iterator;
 
 import net.minecraft.inventory.IInventory;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.config.FuzzyMode;

src/main/java/appeng/util/inv/IMEAdaptorIterator.java

@@ -21,9 +21,10 @@ package appeng.util.inv;
 
 import java.util.Iterator;
 
+import net.minecraft.item.ItemStack;
+
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
-import net.minecraft.item.ItemStack;
 
 
 public final class IMEAdaptorIterator implements Iterator<ItemSlot>

src/test/java/appeng/client/render/UVLightmapJsonTest.java

@@ -19,7 +19,6 @@
 package appeng.client.render;
 
 
-import appeng.core.Registration;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -38,8 +37,8 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.registry.ForgeRegistries;
+
-import net.minecraftforge.fml.common.registry.GameRegistry;
+import appeng.core.Registration;
 
 
 @Mod( modid = "UVLightmapJsonTest", name = "UVLightmapJsonTest", version = "0.0.0" )