fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use IItemHandler instead of IInventory internally (#2971)

Browse Source 
* Use IItemHandler instead of IInventory internally
This commit is contained in:
fscan
2017-07-28 22:04:32 +02:00
committed by yueh
parent c077840988
commit 52d28fabe3
156 changed files with 2410 additions and 4604 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/InventoryAdaptor.java
+14 -54
View File
@@ -19,26 +19,18 @@
package appeng.util;
import java.util.ArrayList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.PlayerInvWrapper;
import appeng.api.config.FuzzyMode;
import appeng.util.inv.AdaptorIInventory;
import appeng.util.inv.AdaptorItemHandler;
import appeng.util.inv.AdaptorList;
import appeng.util.inv.AdaptorPlayerInventory;
import appeng.util.inv.IInventoryDestination;
import appeng.util.inv.ItemSlot;
import appeng.util.inv.WrapperMCISidedInventory;
/**
@@ -49,60 +41,26 @@ import appeng.util.inv.WrapperMCISidedInventory;
*/
public abstract class InventoryAdaptor implements Iterable<ItemSlot>
{
// returns an appropriate adaptor, or null
public static InventoryAdaptor getAdaptor( final Object te, final EnumFacing d )
public static InventoryAdaptor getAdaptor( final TileEntity te, final EnumFacing d )
{
if( te == null )
if( te != null && te.hasCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d ) )
{
return null;
}
if( te instanceof ICapabilityProvider )
{
ICapabilityProvider capProvider = (ICapabilityProvider) te;
// Attempt getting an IItemHandler for the given side via caps
IItemHandler itemHandler = capProvider.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d );
if( itemHandler != null && itemHandler.getSlots() > 0 )
IItemHandler itemHandler = te.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d );
if( itemHandler != null )
{
return new AdaptorItemHandler( itemHandler );
}
}
return null;
}
if( te instanceof EntityPlayer )
public static InventoryAdaptor getAdaptor( final EntityPlayer te )
{
if( te != null )
{
return new AdaptorIInventory( new AdaptorPlayerInventory( ( (EntityPlayer) te ).inventory, false ) );
return new AdaptorItemHandler( new PlayerInvWrapper( te.inventory ) );
}
else if( te instanceof ArrayList )
{
@SuppressWarnings( "unchecked" )
final ArrayList<ItemStack> list = (ArrayList<ItemStack>) te;
return new AdaptorList( list );
}
else if( te instanceof TileEntityChest )
{
return new AdaptorIInventory( Platform.GetChestInv( te ) );
}
else if( te instanceof ISidedInventory )
{
final ISidedInventory si = (ISidedInventory) te;
final int[] slots = si.getSlotsForFace( d );
if( si.getSizeInventory() > 0 && slots != null && slots.length > 0 )
{
return new AdaptorIInventory( new WrapperMCISidedInventory( si, d ) );
}
}
else if( te instanceof IInventory )
{
final IInventory i = (IInventory) te;
if( i.getSizeInventory() > 0 )
{
return new AdaptorIInventory( i );
}
}
return null;
}
@@ -122,4 +80,6 @@ public abstract class InventoryAdaptor implements Iterable<ItemSlot>
public abstract ItemStack simulateAdd( ItemStack toBeSimulated );
public abstract boolean containsItems();
public abstract boolean hasSlots();
}