Most of the 1.8 Port.

src/main/java/appeng/integration/modules/BC.java

@@ -22,15 +22,12 @@ package appeng.integration.modules;
 import java.lang.reflect.Method;
 
 import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import cpw.mods.fml.common.event.FMLInterModComms;
-
+import net.minecraftforge.fml.common.event.FMLInterModComms;
 import buildcraft.BuildCraftEnergy;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.blueprints.BuilderAPI;
@@ -45,7 +42,6 @@ import buildcraft.api.transport.IPipeConnection;
 import buildcraft.api.transport.IPipeTile;
 import buildcraft.transport.ItemFacade;
 import buildcraft.transport.PipeIconProvider;
-
 import appeng.api.AEApi;
 import appeng.api.IAppEngApi;
 import appeng.api.config.TunnelType;
@@ -54,6 +50,7 @@ import appeng.api.definitions.IBlocks;
 import appeng.api.features.IP2PTunnelRegistry;
 import appeng.api.parts.IFacadePart;
 import appeng.api.util.AEItemDefinition;
+import appeng.api.util.ForgeDirection;
 import appeng.api.util.IOrientableBlock;
 import appeng.facade.FacadePart;
 import appeng.integration.BaseModule;
@@ -269,7 +266,7 @@ public final class BC extends BaseModule implements IBC
 	}
 
 	@Override
-	public IIcon getFacadeTexture()
+	public TextureAtlasSprite getFacadeTexture()
 	{
 		try
 		{

src/main/java/appeng/integration/modules/BCHelpers/AECableSchematicTile.java

@@ -26,10 +26,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Vec3;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.api.blueprints.IBuilderContext;
-
 import appeng.api.parts.IFacadeContainer;
 import appeng.api.parts.IPart;
 import appeng.api.parts.IPartHost;
@@ -37,6 +34,7 @@ import appeng.api.parts.LayerFlags;
 import appeng.api.parts.SelectedPart;
 import appeng.api.util.AEColor;
 import appeng.api.util.DimensionalCoord;
+import appeng.api.util.ForgeDirection;
 import appeng.parts.CableBusContainer;
 
 

src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java

@@ -23,11 +23,9 @@ import java.util.ArrayList;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicTile;
-
+import appeng.api.util.ForgeDirection;
 import appeng.api.util.ICommonTile;
 import appeng.tile.AEBaseTile;
 import appeng.util.Platform;

src/main/java/appeng/integration/modules/BCHelpers/AERotatableBlockSchematic.java

@@ -19,11 +19,9 @@
 package appeng.integration.modules.BCHelpers;
 
 
-import net.minecraftforge.common.util.ForgeDirection;
-
 import buildcraft.api.blueprints.IBuilderContext;
 import buildcraft.api.blueprints.SchematicBlock;
-
+import appeng.api.util.ForgeDirection;
 import appeng.util.Platform;
 
 

src/main/java/appeng/integration/modules/BCHelpers/BCPipeHandler.java

@@ -20,12 +20,11 @@ package appeng.integration.modules.BCHelpers;
 
 
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IExternalStorageHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;
+import appeng.api.util.ForgeDirection;
 import appeng.integration.modules.BC;
 
 

src/main/java/appeng/integration/modules/BCHelpers/BCPipeInventory.java

@@ -20,14 +20,13 @@ package appeng.integration.modules.BCHelpers;
 
 
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.api.util.ForgeDirection;
 import appeng.integration.modules.BC;
 
 

src/main/java/appeng/integration/modules/BetterStorage.java

@@ -20,9 +20,8 @@ package appeng.integration.modules;
 
 
 import net.mcft.copy.betterstorage.api.crate.ICrateStorage;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import appeng.api.AEApi;
+import appeng.api.util.ForgeDirection;
 import appeng.integration.IIntegrationModule;
 import appeng.integration.abstraction.IBetterStorage;
 import appeng.integration.modules.helpers.BSCrateHandler;

src/main/java/appeng/integration/modules/CraftGuide.java

@@ -26,9 +26,7 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
-
-import cpw.mods.fml.relauncher.ReflectionHelper;
-
+import net.minecraftforge.fml.relauncher.ReflectionHelper;
 import uristqwerty.CraftGuide.CraftGuideLog;
 import uristqwerty.CraftGuide.DefaultRecipeTemplate;
 import uristqwerty.CraftGuide.RecipeGeneratorImplementation;
@@ -44,7 +42,6 @@ import uristqwerty.CraftGuide.api.StackInfo;
 import uristqwerty.CraftGuide.api.StackInfoSource;
 import uristqwerty.gui_craftguide.texture.DynamicTexture;
 import uristqwerty.gui_craftguide.texture.TextureClip;
-
 import appeng.api.exceptions.MissingIngredientError;
 import appeng.api.exceptions.RegistrationError;
 import appeng.api.recipes.IIngredient;

src/main/java/appeng/integration/modules/FMP.java

@@ -29,9 +29,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
-
-import cpw.mods.fml.common.eventhandler.Event;
-
+import net.minecraftforge.fml.common.eventhandler.Event;
 import codechicken.lib.vec.BlockCoord;
 import codechicken.microblock.BlockMicroMaterial;
 import codechicken.multipart.MultiPartRegistry;
@@ -40,7 +38,6 @@ import codechicken.multipart.MultiPartRegistry.IPartFactory;
 import codechicken.multipart.MultipartGenerator;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
-
 import appeng.api.AEApi;
 import appeng.api.definitions.IBlockDefinition;
 import appeng.api.definitions.IBlocks;

src/main/java/appeng/integration/modules/InvTweaks.java

@@ -20,11 +20,8 @@ package appeng.integration.modules;
 
 
 import net.minecraft.item.ItemStack;
-
-import cpw.mods.fml.common.Loader;
-
+import net.minecraftforge.fml.common.Loader;
 import invtweaks.api.InvTweaksAPI;
-
 import appeng.integration.BaseModule;
 import appeng.integration.abstraction.IInvTweaks;
 

src/main/java/appeng/integration/modules/Mekanism.java

@@ -21,9 +21,7 @@ package appeng.integration.modules;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-
-import cpw.mods.fml.common.event.FMLInterModComms;
-
+import net.minecraftforge.fml.common.event.FMLInterModComms;
 import appeng.integration.BaseModule;
 import appeng.integration.abstraction.IMekanism;
 

src/main/java/appeng/integration/modules/RF.java

@@ -20,10 +20,8 @@ package appeng.integration.modules;
 
 
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.oredict.OreDictionary;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-
 import appeng.api.AEApi;
 import appeng.api.config.TunnelType;
 import appeng.helpers.Reflected;

src/main/java/appeng/integration/modules/Waila.java

@@ -19,11 +19,9 @@
 package appeng.integration.modules;
 
 
-import cpw.mods.fml.common.event.FMLInterModComms;
-
+import net.minecraftforge.fml.common.event.FMLInterModComms;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.IWailaRegistrar;
-
 import appeng.integration.BaseModule;
 import appeng.integration.modules.waila.PartWailaDataProvider;
 import appeng.integration.modules.waila.TileWailaDataProvider;

src/main/java/appeng/integration/modules/helpers/BSCrate.java

@@ -21,14 +21,13 @@ package appeng.integration.modules.helpers;
 
 import net.mcft.copy.betterstorage.api.crate.ICrateStorage;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import appeng.api.config.Actionable;
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
+import appeng.api.util.ForgeDirection;
 import appeng.util.item.AEItemStack;
 
 

src/main/java/appeng/integration/modules/helpers/BSCrateHandler.java

@@ -21,12 +21,11 @@ package appeng.integration.modules.helpers;
 
 import net.mcft.copy.betterstorage.api.crate.ICrateStorage;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IExternalStorageHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;
+import appeng.api.util.ForgeDirection;
 
 
 public class BSCrateHandler implements IExternalStorageHandler

src/main/java/appeng/integration/modules/helpers/BSCrateStorageAdaptor.java

@@ -23,9 +23,8 @@ import java.util.Iterator;
 
 import net.mcft.copy.betterstorage.api.crate.ICrateStorage;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import appeng.api.config.FuzzyMode;
+import appeng.api.util.ForgeDirection;
 import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
 import appeng.util.inv.IInventoryDestination;

src/main/java/appeng/integration/modules/helpers/FMPPacketEvent.java

@@ -20,8 +20,7 @@ package appeng.integration.modules.helpers;
 
 
 import net.minecraft.entity.player.EntityPlayerMP;
-
-import cpw.mods.fml.common.eventhandler.Event;
+import net.minecraftforge.fml.common.eventhandler.Event;
 
 
 public class FMPPacketEvent extends Event

src/main/java/appeng/integration/modules/helpers/FactorizationHandler.java

@@ -20,12 +20,11 @@ package appeng.integration.modules.helpers;
 
 
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IExternalStorageHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;
+import appeng.api.util.ForgeDirection;
 import appeng.integration.modules.FZ;
 import appeng.me.storage.MEMonitorIInventory;
 import appeng.util.inv.IMEAdaptor;

src/main/java/appeng/integration/modules/helpers/MFRDSUHandler.java

@@ -20,12 +20,11 @@ package appeng.integration.modules.helpers;
 
 
 import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.common.util.ForgeDirection;
-
 import appeng.api.networking.security.BaseActionSource;
 import appeng.api.storage.IExternalStorageHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;
+import appeng.api.util.ForgeDirection;
 import appeng.integration.modules.DSU;
 import appeng.me.storage.MEMonitorIInventory;
 import appeng.util.inv.IMEAdaptor;

src/main/java/appeng/integration/modules/helpers/NullRFHandler.java

@@ -19,8 +19,7 @@
 package appeng.integration.modules.helpers;
 
 
-import net.minecraftforge.common.util.ForgeDirection;
-
+import appeng.api.util.ForgeDirection;
 import cofh.api.energy.IEnergyReceiver;