From 067da3fec06853afdb1737e30e801c1fdb8b784d Mon Sep 17 00:00:00 2001
From: yueh <yueh@orod.de>
Date: Sat, 17 Sep 2016 15:27:23 +0200
Subject: [PATCH] Deprecated IExternalStorageHandler in favour of IItemHandler

---
 src/api/java/appeng/api/features/IRegistryContainer.java   | 4 ++++
 .../java/appeng/api/storage/IExternalStorageHandler.java   | 7 ++++++-
 .../java/appeng/api/storage/IExternalStorageRegistry.java  | 7 ++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/api/java/appeng/api/features/IRegistryContainer.java b/src/api/java/appeng/api/features/IRegistryContainer.java
index 688da9f2..2efbcb60 100644
--- a/src/api/java/appeng/api/features/IRegistryContainer.java
+++ b/src/api/java/appeng/api/features/IRegistryContainer.java
@@ -30,6 +30,7 @@ import appeng.api.networking.IGridCacheRegistry;
 import appeng.api.parts.IPartModels;
 import appeng.api.storage.ICellRegistry;
 import appeng.api.storage.IExternalStorageRegistry;
+import net.minecraftforge.items.IItemHandler;
 
 
 /**
@@ -55,7 +56,10 @@ public interface IRegistryContainer
 	/**
 	 * Add additional storage bus handlers to improve interplay with mod blocks that contains special inventories that
 	 * function unlike vanilla chests. AE uses this internally for barrels, DSU's, quantum chests, AE Networks and more.
+	 * 
+	 * @deprecated in favour of {@link IItemHandler}
 	 */
+	@Deprecated
 	IExternalStorageRegistry externalStorage();
 
 	/**
diff --git a/src/api/java/appeng/api/storage/IExternalStorageHandler.java b/src/api/java/appeng/api/storage/IExternalStorageHandler.java
index 81f941f8..bcd8a2b1 100644
--- a/src/api/java/appeng/api/storage/IExternalStorageHandler.java
+++ b/src/api/java/appeng/api/storage/IExternalStorageHandler.java
@@ -26,13 +26,16 @@ package appeng.api.storage;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
-
+import net.minecraftforge.items.IItemHandler;
 import appeng.api.networking.security.BaseActionSource;
 
 
 /**
  * A Registration Record for {@link IExternalStorageRegistry}
+ * 
+ * @deprecated in favour of {@link IItemHandler}
  */
+@Deprecated
 public interface IExternalStorageHandler
 {
 
@@ -45,6 +48,7 @@ public interface IExternalStorageHandler
 	 *
 	 * @return true, if it can get a handler via getInventory
 	 */
+	@Deprecated
 	boolean canHandle( TileEntity te, EnumFacing d, StorageChannel channel, BaseActionSource mySrc );
 
 	/**
@@ -60,5 +64,6 @@ public interface IExternalStorageHandler
 	 *
 	 * @return The Handler for the inventory
 	 */
+	@Deprecated
 	IMEInventory getInventory( TileEntity te, EnumFacing d, StorageChannel channel, BaseActionSource src );
 }
\ No newline at end of file
diff --git a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java
index eb6f80c5..0c7d849b 100644
--- a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java
+++ b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java
@@ -26,7 +26,7 @@ package appeng.api.storage;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
-
+import net.minecraftforge.items.IItemHandler;
 import appeng.api.IAppEngApi;
 import appeng.api.networking.security.BaseActionSource;
 
@@ -35,7 +35,10 @@ import appeng.api.networking.security.BaseActionSource;
  * A Registry of External Storage handlers.
  *
  * Do not implement obtain via {@link IAppEngApi}.registries().getExternalStorageRegistry()
+ * 
+ * @deprecated in favour of {@link IItemHandler}
  */
+@Deprecated
 public interface IExternalStorageRegistry
 {
 
@@ -44,6 +47,7 @@ public interface IExternalStorageRegistry
 	 *
 	 * @param esh storage handler
 	 */
+	@Deprecated
 	void addExternalStorageInterface( IExternalStorageHandler esh );
 
 	/**
@@ -54,5 +58,6 @@ public interface IExternalStorageRegistry
 	 *
 	 * @return the handler for a given tile / forge direction
 	 */
+	@Deprecated
 	IExternalStorageHandler getHandler( TileEntity te, EnumFacing opposite, StorageChannel channel, BaseActionSource mySrc );
 }
\ No newline at end of file