tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Deprecated IExternalStorageHandler in favour of IItemHandler

Browse source
This commit is contained in:
yueh 2016-09-17 15:27:23 +02:00
parent 7ae4cc86c7
commit 067da3fec0
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/java/appeng/api/features/IRegistryContainer.java
View file

@ -30,6 +30,7 @@ import appeng.api.networking.IGridCacheRegistry;
import appeng.api.parts.IPartModels; import appeng.api.parts.IPartModels;
import appeng.api.storage.ICellRegistry; import appeng.api.storage.ICellRegistry;
import appeng.api.storage.IExternalStorageRegistry; 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 * 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. * 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(); IExternalStorageRegistry externalStorage();
/** /**

7
src/api/java/appeng/api/storage/IExternalStorageHandler.java
View file

@ -26,13 +26,16 @@ package appeng.api.storage;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandler;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
/** /**
* A Registration Record for {@link IExternalStorageRegistry} * A Registration Record for {@link IExternalStorageRegistry}
*
* @deprecated in favour of {@link IItemHandler}
*/ */
@Deprecated
public interface IExternalStorageHandler public interface IExternalStorageHandler
{ {
@ -45,6 +48,7 @@ public interface IExternalStorageHandler
* *
* @return true, if it can get a handler via getInventory * @return true, if it can get a handler via getInventory
*/ */
@Deprecated
boolean canHandle( TileEntity te, EnumFacing d, StorageChannel channel, BaseActionSource mySrc ); boolean canHandle( TileEntity te, EnumFacing d, StorageChannel channel, BaseActionSource mySrc );
/** /**
@ -60,5 +64,6 @@ public interface IExternalStorageHandler
* *
* @return The Handler for the inventory * @return The Handler for the inventory
*/ */
@Deprecated
IMEInventory getInventory( TileEntity te, EnumFacing d, StorageChannel channel, BaseActionSource src ); IMEInventory getInventory( TileEntity te, EnumFacing d, StorageChannel channel, BaseActionSource src );
} }

7
src/api/java/appeng/api/storage/IExternalStorageRegistry.java
View file

@ -26,7 +26,7 @@ package appeng.api.storage;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.IItemHandler;
import appeng.api.IAppEngApi; import appeng.api.IAppEngApi;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
@ -35,7 +35,10 @@ import appeng.api.networking.security.BaseActionSource;
* A Registry of External Storage handlers. * A Registry of External Storage handlers.
* *
* Do not implement obtain via {@link IAppEngApi}.registries().getExternalStorageRegistry() * Do not implement obtain via {@link IAppEngApi}.registries().getExternalStorageRegistry()
*
* @deprecated in favour of {@link IItemHandler}
*/ */
@Deprecated
public interface IExternalStorageRegistry public interface IExternalStorageRegistry
{ {
@ -44,6 +47,7 @@ public interface IExternalStorageRegistry
* *
* @param esh storage handler * @param esh storage handler
*/ */
@Deprecated
void addExternalStorageInterface( IExternalStorageHandler esh ); void addExternalStorageInterface( IExternalStorageHandler esh );
/** /**
@ -54,5 +58,6 @@ public interface IExternalStorageRegistry
* *
* @return the handler for a given tile / forge direction * @return the handler for a given tile / forge direction
*/ */
@Deprecated
IExternalStorageHandler getHandler( TileEntity te, EnumFacing opposite, StorageChannel channel, BaseActionSource mySrc ); IExternalStorageHandler getHandler( TileEntity te, EnumFacing opposite, StorageChannel channel, BaseActionSource mySrc );
} }