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/items/contents/NetworkToolViewer.java
+29 -104
View File
@@ -19,18 +19,20 @@
package appeng.items.contents;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.items.IItemHandler;
import appeng.api.implementations.guiobjects.INetworkTool;
import appeng.api.implementations.items.IUpgradeModule;
import appeng.api.networking.IGridHost;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.Platform;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
import appeng.util.inv.filter.IAEItemFilter;
public class NetworkToolViewer implements INetworkTool
public class NetworkToolViewer implements INetworkTool, IAEAppEngInventory
{
private final AppEngInternalInventory inv;
@@ -41,7 +43,8 @@ public class NetworkToolViewer implements INetworkTool
{
this.is = is;
this.gh = gHost;
this.inv = new AppEngInternalInventory( null, 9 );
this.inv = new AppEngInternalInventory( this, 9 );
this.inv.setFilter( new NetworkToolInventoryFilter() );
if( is.hasTagCompound() ) // prevent crash when opening network status screen.
{
this.inv.readFromNBT( Platform.openNbtData( is ), "inv" );
@@ -49,85 +52,17 @@ public class NetworkToolViewer implements INetworkTool
}
@Override
public int getSizeInventory()
public void saveChanges()
{
return this.inv.getSizeInventory();
inv.markDirty( -1 );
}
@Override
public ItemStack getStackInSlot( final int i )
public void onChangeInventory( IItemHandler inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack )
{
return this.inv.getStackInSlot( i );
}
@Override
public ItemStack decrStackSize( final int i, final int j )
{
return this.inv.decrStackSize( i, j );
}
@Override
public ItemStack removeStackFromSlot( int i )
{
return this.inv.removeStackFromSlot( i );
}
@Override
public void setInventorySlotContents( final int i, final ItemStack itemstack )
{
this.inv.setInventorySlotContents( i, itemstack );
}
@Override
public String getName()
{
return this.inv.getName();
}
@Override
public boolean hasCustomName()
{
return this.inv.hasCustomName();
}
@Override
public int getInventoryStackLimit()
{
return this.inv.getInventoryStackLimit();
}
@Override
public void markDirty()
{
this.inv.markDirty();
this.inv.writeToNBT( Platform.openNbtData( this.is ), "inv" );
}
@Override
public boolean isUsableByPlayer( final EntityPlayer entityplayer )
{
return this.inv.isUsableByPlayer( entityplayer );
}
@Override
public void openInventory( final EntityPlayer player )
{
this.inv.openInventory( player );
}
@Override
public void closeInventory( final EntityPlayer player )
{
this.inv.closeInventory( player );
}
@Override
public boolean isItemValidForSlot( final int i, final ItemStack itemstack )
{
return this.inv.isItemValidForSlot( i,
itemstack ) && itemstack.getItem() instanceof IUpgradeModule && ( (IUpgradeModule) itemstack.getItem() ).getType( itemstack ) != null;
}
@Override
public ItemStack getItemStack()
{
@@ -140,39 +75,29 @@ public class NetworkToolViewer implements INetworkTool
return this.gh;
}
@Override
public int getField( final int id )
private static class NetworkToolInventoryFilter implements IAEItemFilter
{
return this.inv.getField( id );
@Override
public boolean allowExtract( IItemHandler inv, int slot, int amount )
{
return true;
}
@Override
public boolean allowInsert( IItemHandler inv, int slot, ItemStack stack )
{
return stack.getItem() instanceof IUpgradeModule && ( (IUpgradeModule) stack.getItem() ).getType( stack ) != null;
}
}
public IItemHandler getInternalInventory()
{
return inv;
}
@Override
public void setField( final int id, final int value )
public IItemHandler getInventory()
{
this.inv.setField( id, value );
}
@Override
public int getFieldCount()
{
return this.inv.getFieldCount();
}
@Override
public void clear()
{
this.inv.clear();
}
@Override
public ITextComponent getDisplayName()
{
return this.inv.getDisplayName();
}
@Override
public boolean isEmpty()
{
return false;
return this.inv;
}
}