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/tile/inventory/AppEngInternalAEInventory.java
+80 -108
View File
@@ -21,24 +21,26 @@ package appeng.tile.inventory;
import java.util.Iterator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import javax.annotation.Nonnull;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.items.ItemHandlerHelper;
import appeng.api.AEApi;
import appeng.api.storage.data.IAEItemStack;
import appeng.core.AELog;
import appeng.util.Platform;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.IInternalItemHandler;
import appeng.util.inv.InvOperation;
import appeng.util.item.AEItemStack;
import appeng.util.iterators.AEInvIterator;
import appeng.util.iterators.InvIterator;
public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack>
public class AppEngInternalAEInventory implements IInternalItemHandler, Iterable<ItemStack>
{
private final IAEAppEngInventory te;
private final IAEItemStack[] inv;
private final int size;
@@ -52,19 +54,6 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
this.inv = new IAEItemStack[s];
}
@Override
public boolean isEmpty()
{
for( int x = 0; x < this.size; x++ )
{
if( !this.getStackInSlot( x ).isEmpty() )
{
return false;
}
}
return true;
}
public void setMaxStackSize( final int s )
{
this.maxStack = s;
@@ -132,8 +121,13 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
}
}
protected int getStackLimit( int slot, @Nonnull ItemStack stack )
{
return Math.min( getSlotLimit( slot ), stack.getMaxStackSize() );
}
@Override
public int getSizeInventory()
public int getSlots()
{
return this.size;
}
@@ -150,42 +144,79 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
}
@Override
public ItemStack decrStackSize( final int slot, final int qty )
public ItemStack insertItem( int slot, ItemStack stack, boolean simulate )
{
if( stack.isEmpty() )
{
return ItemStack.EMPTY;
}
ItemStack existing = getStackInSlot( slot );
int limit = getStackLimit( slot, stack );
if( !existing.isEmpty() )
{
if( !ItemHandlerHelper.canItemStacksStack( stack, existing ) )
{
return stack;
}
limit -= existing.getCount();
}
if( limit <= 0 )
{
return stack;
}
boolean reachedLimit = stack.getCount() > limit;
if( !simulate )
{
if( existing.isEmpty() )
{
this.inv[slot] = AEApi.instance().storage().createItemStack( reachedLimit ? ItemHandlerHelper.copyStackWithSize( stack, limit ) : stack );
}
else
{
existing.grow( reachedLimit ? limit : stack.getCount() );
}
fireOnChangeInventory( slot, InvOperation.INSERT, ItemStack.EMPTY, reachedLimit ? ItemHandlerHelper.copyStackWithSize( stack, limit ) : stack );
}
return reachedLimit ? ItemHandlerHelper.copyStackWithSize( stack, stack.getCount() - limit ) : ItemStack.EMPTY;
}
@Override
public ItemStack extractItem( int slot, int amount, boolean simulate )
{
if( this.inv[slot] != null )
{
final ItemStack split = this.getStackInSlot( slot );
ItemStack ns = ItemStack.EMPTY;
if( qty >= split.getCount() )
if( amount >= split.getCount() )
{
ns = this.getStackInSlot( slot );
this.inv[slot] = null;
if( !simulate )
{
this.inv[slot] = null;
fireOnChangeInventory( slot, InvOperation.EXTRACT, split, ItemStack.EMPTY );
}
return split;
}
else
{
ns = split.splitStack( qty );
if( !simulate )
{
split.grow( -amount );
fireOnChangeInventory( slot, InvOperation.EXTRACT, ItemHandlerHelper.copyStackWithSize( split, amount ), ItemStack.EMPTY );
}
return ItemHandlerHelper.copyStackWithSize( split, amount );
}
if( this.te != null && Platform.isServer() )
{
this.te.onChangeInventory( this, slot, InvOperation.decreaseStackSize, ns, ItemStack.EMPTY );
}
return ns;
}
return ItemStack.EMPTY;
}
@Override
public ItemStack removeStackFromSlot( final int var1 )
{
return ItemStack.EMPTY;
}
@Override
public void setInventorySlotContents( final int slot, final ItemStack newItemStack )
public void setStackInSlot( final int slot, final ItemStack newItemStack )
{
final ItemStack oldStack = this.getStackInSlot( slot );
this.inv[slot] = AEApi.instance().storage().createItemStack( newItemStack );
@@ -214,48 +245,22 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
removed = added = ItemStack.EMPTY;
}
}
this.te.onChangeInventory( this, slot, InvOperation.setInventorySlotContents, removed, added );
fireOnChangeInventory( slot, InvOperation.SET, removed, added );
}
}
@Override
public String getName()
{
return "appeng-internal";
}
@Override
public boolean hasCustomName()
{
return false;
}
@Override
public int getInventoryStackLimit()
{
return this.maxStack > 64 ? 64 : this.maxStack;
}
@Override
public void markDirty()
private void fireOnChangeInventory( int slot, InvOperation op, ItemStack removed, ItemStack inserted )
{
if( this.te != null && Platform.isServer() )
{
this.te.onChangeInventory( this, -1, InvOperation.markDirty, ItemStack.EMPTY, ItemStack.EMPTY );
this.te.onChangeInventory( this, slot, op, removed, inserted );
}
}
@Override
public boolean isUsableByPlayer( final EntityPlayer var1 )
public int getSlotLimit( int slot )
{
return true;
}
@Override
public boolean isItemValidForSlot( final int i, final ItemStack itemstack )
{
return true;
return this.maxStack > 64 ? 64 : this.maxStack;
}
@Override
@@ -270,47 +275,14 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
}
@Override
public ITextComponent getDisplayName()
public boolean isItemValidForSlot( int slot, ItemStack stack )
{
return null;
return true;
}
@Override
public void openInventory( final EntityPlayer player )
public void markDirty( int slot )
{
}
@Override
public void closeInventory( final EntityPlayer player )
{
}
@Override
public int getField( final int id )
{
return 0;
}
@Override
public void setField( final int id, final int value )
{
}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
for( int x = 0; x < this.size; x++ )
{
this.setInventorySlotContents( x, ItemStack.EMPTY );
}
fireOnChangeInventory( slot, InvOperation.DIRTY, ItemStack.EMPTY, ItemStack.EMPTY );
}
}