Restore DSU Api, mark all other api's as dead.

core/AppEng.java

@@ -75,7 +75,8 @@ public class AppEng
 			IntegrationSide.BOTH, "Universal Electricity", null, "UE", // UE
 			IntegrationSide.BOTH, "Logistics Pipes", "LogisticsPipes|Main", "LP", // LP
 			// IntegrationSide.CLIENT, "Inventory Tweaks", "", "InvTweaks",
-			IntegrationSide.BOTH, "Mine Factory Reloaded", "MineFactoryReloaded", "MFR", // MFR
+			// IntegrationSide.BOTH, "Mine Factory Reloaded", "MineFactoryReloaded", "MFR", // MFR
+			IntegrationSide.BOTH, "Deep Storage Unit", null, "DSU", // DSU
 			IntegrationSide.BOTH, "Better Storage", "betterstorage", "BS", // BS
 			IntegrationSide.BOTH, "Factorization", "factorization", "FZ", // FZ
 			IntegrationSide.BOTH, "Forestry", "Forestry", "Forestry", // Forestry

integration/abstraction/IDSU.java

@@ -3,7 +3,7 @@ package appeng.integration.abstraction;
 import net.minecraft.tileentity.TileEntity;
 import appeng.api.storage.IMEInventory;
 
-public interface IMFR
+public interface IDSU
 {
 
 	IMEInventory getDSU(TileEntity te);

integration/modules/DSU.java

@@ -5,14 +5,14 @@ import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
 import appeng.api.AEApi;
 import appeng.api.storage.IMEInventory;
 import appeng.integration.IIntegrationModule;
-import appeng.integration.abstraction.IMFR;
+import appeng.integration.abstraction.IDSU;
 import appeng.integration.modules.helpers.MFRDSU;
 import appeng.integration.modules.helpers.MFRDSUHandler;
 
-public class MFR implements IIntegrationModule, IMFR
+public class DSU implements IIntegrationModule, IDSU
 {
 
-	public static MFR instance;
+	public static DSU instance;
 
 	@Override
 	public IMEInventory getDSU(TileEntity te)

integration/modules/dead/BC.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,7 +14,7 @@ import appeng.api.parts.IFacadePart;
 import appeng.facade.FacadePart;
 import appeng.integration.IIntegrationModule;
 import appeng.integration.abstraction.IBC;
-import appeng.integration.modules.helpers.BCPipeHandler;
+import appeng.integration.modules.helpers.dead.BCPipeHandler;
 import buildcraft.BuildCraftEnergy;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.tools.IToolWrench;

integration/modules/dead/BS.java

@@ -1,12 +1,12 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import net.mcft.copy.betterstorage.api.ICrateStorage;
 import net.minecraftforge.common.util.ForgeDirection;
 import appeng.api.AEApi;
 import appeng.integration.IIntegrationModule;
 import appeng.integration.abstraction.IBS;
-import appeng.integration.modules.helpers.BSCrateHandler;
-import appeng.integration.modules.helpers.BSCrateStorageAdaptor;
+import appeng.integration.modules.helpers.dead.BSCrateHandler;
+import appeng.integration.modules.helpers.dead.BSCrateStorageAdaptor;
 import appeng.util.InventoryAdaptor;
 
 public class BS implements IIntegrationModule, IBS

integration/modules/dead/FMP.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;

integration/modules/dead/FZ.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -11,8 +11,8 @@ import appeng.api.AEApi;
 import appeng.api.storage.IMEInventory;
 import appeng.integration.IIntegrationModule;
 import appeng.integration.abstraction.IFZ;
-import appeng.integration.modules.helpers.FactorizationBarrel;
-import appeng.integration.modules.helpers.FactorizationHandler;
+import appeng.integration.modules.helpers.dead.FactorizationBarrel;
+import appeng.integration.modules.helpers.dead.FactorizationHandler;
 import appeng.util.Platform;
 
 /**

integration/modules/dead/Forestry.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import appeng.integration.IIntegrationModule;
 

integration/modules/dead/GT.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import gregtechmod.api.interfaces.IDigitalChest;
 import net.minecraft.inventory.IInventory;
@@ -8,8 +8,8 @@ import appeng.api.AEApi;
 import appeng.api.storage.IMEInventory;
 import appeng.integration.IIntegrationModule;
 import appeng.integration.abstraction.IGT;
-import appeng.integration.modules.helpers.GregTechHandler;
-import appeng.integration.modules.helpers.GregTechQuantumChest;
+import appeng.integration.modules.helpers.dead.GregTechHandler;
+import appeng.integration.modules.helpers.dead.GregTechQuantumChest;
 import appeng.util.InventoryAdaptor;
 
 public class GT implements IGT, IIntegrationModule

integration/modules/dead/IC2.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import ic2.api.energy.tile.IEnergyTile;
 import ic2.api.recipe.RecipeInputItemStack;

integration/modules/dead/InvTweaks.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import appeng.integration.IIntegrationModule;
 

integration/modules/dead/LP.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import appeng.integration.IIntegrationModule;
 

integration/modules/dead/MJ.java

@@ -1,9 +1,9 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import appeng.integration.IIntegrationModule;
 import appeng.integration.abstraction.IMJ;
-import appeng.integration.modules.helpers.BCPerdition;
 import appeng.integration.modules.helpers.BaseBCperdition;
+import appeng.integration.modules.helpers.dead.BCPerdition;
 import appeng.tile.powersink.BuildCraft;
 import buildcraft.api.power.IPowerReceptor;
 

integration/modules/dead/Mekanism.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

integration/modules/dead/Mystcraft.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import appeng.integration.IIntegrationModule;
 

integration/modules/dead/NEI.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import java.lang.reflect.Method;
 

integration/modules/dead/RC.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import mods.railcraft.api.crafting.IRockCrusherRecipe;
 import mods.railcraft.api.crafting.RailcraftCraftingManager;

integration/modules/dead/TE.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

integration/modules/dead/UE.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules;
+package appeng.integration.modules.dead;
 
 import appeng.integration.IIntegrationModule;
 

integration/modules/helpers/MFRDSUHandler.java

@@ -5,7 +5,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import appeng.api.storage.IExternalStorageHandler;
 import appeng.api.storage.IMEInventory;
 import appeng.api.storage.StorageChannel;
-import appeng.integration.modules.MFR;
+import appeng.integration.modules.DSU;
 
 public class MFRDSUHandler implements IExternalStorageHandler
 {
@@ -13,14 +13,14 @@ public class MFRDSUHandler implements IExternalStorageHandler
 	@Override
 	public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel chan)
 	{
-		return chan == StorageChannel.ITEMS && MFR.instance.isDSU( te );
+		return chan == StorageChannel.ITEMS && DSU.instance.isDSU( te );
 	}
 
 	@Override
 	public IMEInventory getInventory(TileEntity te, ForgeDirection d, StorageChannel chan)
 	{
 		if ( chan == StorageChannel.ITEMS )
-			return MFR.instance.getDSU( te );
+			return DSU.instance.getDSU( te );
 		return null;
 	}
 

integration/modules/helpers/dead/BCPerdition.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.minecraft.nbt.NBTTagCompound;
 import buildcraft.api.power.IPowerReceptor;

integration/modules/helpers/dead/BCPipeHandler.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;

integration/modules/helpers/dead/BCPipeInventory.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;

integration/modules/helpers/dead/BSCrate.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.mcft.copy.betterstorage.api.ICrateStorage;
 import net.minecraft.item.ItemStack;

integration/modules/helpers/dead/BSCrateHandler.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.mcft.copy.betterstorage.api.ICrateStorage;
 import net.minecraft.tileentity.TileEntity;

integration/modules/helpers/dead/BSCrateStorageAdaptor.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import java.util.Iterator;
 

integration/modules/helpers/dead/FMPPacketEvent.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.event.Event;

integration/modules/helpers/dead/FactorizationBarrel.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;

integration/modules/helpers/dead/FactorizationHandler.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;

integration/modules/helpers/dead/ForestryGeneticsComparison.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import appeng.api.features.IItemComparison;
 import appeng.api.integration.IBeeComparison;

integration/modules/helpers/dead/ForestryGeneticsProvider.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.minecraft.item.ItemStack;
 import appeng.api.features.IItemComparisionProvider;

integration/modules/helpers/dead/GregTechHandler.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.util.ForgeDirection;

integration/modules/helpers/dead/GregTechQuantumChest.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import gregtechmod.api.interfaces.IDigitalChest;
 import net.minecraft.inventory.IInventory;

integration/modules/helpers/dead/NEIQuartzShapedRecipeHandler.java

@@ -1,4 +1,4 @@
-package appeng.integration.modules.helpers;
+package appeng.integration.modules.helpers.dead;
 
 import java.awt.Rectangle;
 import java.util.ArrayList;