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

Rework AEItemStack (#3091)

Browse Source 
* Use itemstack as itemdef
* HIGH_TAG/LOW_TAG should be compared both directions
* Remove getTagCompound
* Make Itemlist implementation independent
* Cache item id for performance reasons
* Add preconditions to saveguard against external meddling
* Chache itemDamage
* Remove IAEStackSearchKey for now, rename getDisplayStack
This commit is contained in:
fscan
2017-09-30 17:18:30 +02:00
committed by yueh
parent 2ed7a5598a
commit 1e15b23506
75 changed files with 559 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+14 -14
View File
@@ -862,7 +862,7 @@ public abstract class AEBaseContainer extends Container
if( slotItem != null )
{
IAEItemStack ais = slotItem.copy();
ItemStack myItem = ais.getItemStack();
ItemStack myItem = ais.createItemStack();
ais.setStackSize( myItem.getMaxStackSize() );
@@ -878,7 +878,7 @@ public abstract class AEBaseContainer extends Container
ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() );
if( ais != null )
{
adp.addItems( ais.getItemStack() );
adp.addItems( ais.createItemStack() );
}
}
break;
@@ -902,7 +902,7 @@ public abstract class AEBaseContainer extends Container
{
final InventoryAdaptor ia = new AdaptorItemHandler( new WrapperCursorItemHandler( player.inventory ) );
final ItemStack fail = ia.removeItems( 1, extracted.getItemStack(), null );
final ItemStack fail = ia.removeItems( 1, extracted.getDefinition(), null );
if( fail.isEmpty() )
{
this.getCellInventory().extractItems( extracted, Actionable.MODULATE, this.getActionSource() );
@@ -931,7 +931,7 @@ public abstract class AEBaseContainer extends Container
{
liftQty = 0;
}
if( !Platform.itemComparisons().isSameItem( slotItem.getItemStack(), item ) )
if( !Platform.itemComparisons().isSameItem( slotItem.getDefinition(), item ) )
{
liftQty = 0;
}
@@ -946,7 +946,7 @@ public abstract class AEBaseContainer extends Container
{
final InventoryAdaptor ia = new AdaptorItemHandler( new WrapperCursorItemHandler( player.inventory ) );
final ItemStack fail = ia.addItems( ais.getItemStack() );
final ItemStack fail = ia.addItems( ais.createItemStack() );
if( !fail.isEmpty() )
{
this.getCellInventory().injectItems( ais, Actionable.MODULATE, this.getActionSource() );
@@ -968,11 +968,11 @@ public abstract class AEBaseContainer extends Container
if( slotItem != null )
{
IAEItemStack ais = slotItem.copy();
ais.setStackSize( ais.getItemStack().getMaxStackSize() );
ais.setStackSize( ais.getDefinition().getMaxStackSize() );
ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() );
if( ais != null )
{
player.inventory.setItemStack( ais.getItemStack() );
player.inventory.setItemStack( ais.createItemStack() );
}
else
{
@@ -987,7 +987,7 @@ public abstract class AEBaseContainer extends Container
ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() );
if( ais != null )
{
player.inventory.setItemStack( ais.getItemStack() );
player.inventory.setItemStack( ais.createItemStack() );
}
else
{
@@ -1008,7 +1008,7 @@ public abstract class AEBaseContainer extends Container
if( slotItem != null )
{
IAEItemStack ais = slotItem.copy();
final long maxSize = ais.getItemStack().getMaxStackSize();
final long maxSize = ais.getDefinition().getMaxStackSize();
ais.setStackSize( maxSize );
ais = this.getCellInventory().extractItems( ais, Actionable.SIMULATE, this.getActionSource() );
@@ -1021,7 +1021,7 @@ public abstract class AEBaseContainer extends Container
if( ais != null )
{
player.inventory.setItemStack( ais.getItemStack() );
player.inventory.setItemStack( ais.createItemStack() );
}
else
{
@@ -1051,7 +1051,7 @@ public abstract class AEBaseContainer extends Container
case CREATIVE_DUPLICATE:
if( player.capabilities.isCreativeMode && slotItem != null )
{
final ItemStack is = slotItem.getItemStack();
final ItemStack is = slotItem.createItemStack();
is.setCount( is.getMaxStackSize() );
player.inventory.setItemStack( is );
this.updateHeld( player );
@@ -1070,7 +1070,7 @@ public abstract class AEBaseContainer extends Container
for( int slotNum = 0; slotNum < playerInv; slotNum++ )
{
IAEItemStack ais = slotItem.copy();
ItemStack myItem = ais.getItemStack();
ItemStack myItem = ais.createItemStack();
ais.setStackSize( myItem.getMaxStackSize() );
@@ -1086,7 +1086,7 @@ public abstract class AEBaseContainer extends Container
ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() );
if( ais != null )
{
adp.addItems( ais.getItemStack() );
adp.addItems( ais.createItemStack() );
}
else
{
@@ -1129,7 +1129,7 @@ public abstract class AEBaseContainer extends Container
{
return ItemStack.EMPTY;
}
return ais.getItemStack();
return ais.createItemStack();
}
private void updateSlot( final Slot clickSlot )
src/main/java/appeng/container/implementations/ContainerCellWorkbench.java
+2 -2
View File
@@ -240,8 +240,8 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
{
if( i.hasNext() )
{
final ItemStack g = i.next().getItemStack();
g.setCount( 1 );
// TODO: check if ok
final ItemStack g = i.next().asItemStackRepresentation();
ItemHandlerUtil.setStackInSlot( inv, x, g );
}
else
src/main/java/appeng/container/implementations/ContainerMEPortableCell.java
+1 -2
View File
@@ -26,7 +26,6 @@ import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
import appeng.api.implementations.guiobjects.IPortableCell;
import appeng.container.interfaces.IInventorySlotAware;
import appeng.util.Platform;
public class ContainerMEPortableCell extends ContainerMEMonitorable
@@ -67,7 +66,7 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable
{
if( !currentItem.isEmpty() )
{
if( Platform.itemComparisons().isEqualItem( this.civ.getItemStack(), currentItem ) )
if( ItemStack.areItemsEqual( this.civ.getItemStack(), currentItem ) )
{
this.getPlayerInv().setInventorySlotContents( this.getPlayerInv().currentItem, this.civ.getItemStack() );
}
src/main/java/appeng/container/implementations/ContainerNetworkTool.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class ContainerNetworkTool extends AEBaseContainer
{
if( !currentItem.isEmpty() )
{
if( Platform.itemComparisons().isEqualItem( this.toolInv.getItemStack(), currentItem ) )
if( ItemStack.areItemsEqual( this.toolInv.getItemStack(), currentItem ) )
{
this.getPlayerInv().setInventorySlotContents( this.getPlayerInv().currentItem, this.toolInv.getItemStack() );
}
src/main/java/appeng/container/implementations/ContainerPatternTerm.java
+3 -3
View File
@@ -364,7 +364,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
inv = playerInv;
}
if( !inv.simulateAdd( out.getItemStack() ).isEmpty() )
if( !inv.simulateAdd( out.createItemStack() ).isEmpty() )
{
return;
}
@@ -374,7 +374,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
if( extracted != null )
{
inv.addItems( extracted.getItemStack() );
inv.addItems( extracted.createItemStack() );
if( p instanceof EntityPlayerMP )
{
this.updateHeld( (EntityPlayerMP) p );
@@ -388,7 +388,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
for( int x = 0; x < 9; x++ )
{
ic.setInventorySlotContents( x, packetPatternSlot.pattern[x] == null ? ItemStack.EMPTY : packetPatternSlot.pattern[x].getItemStack() );
ic.setInventorySlotContents( x, packetPatternSlot.pattern[x] == null ? ItemStack.EMPTY : packetPatternSlot.pattern[x].createItemStack() );
}
final IRecipe r = CraftingManager.findMatchingRecipe( ic, p.world );
src/main/java/appeng/container/implementations/ContainerQuartzKnife.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class ContainerQuartzKnife extends AEBaseContainer
{
if( !currentItem.isEmpty() )
{
if( Platform.itemComparisons().isEqualItem( this.toolInv.getItemStack(), currentItem ) )
if( ItemStack.areItemsEqual( this.toolInv.getItemStack(), currentItem ) )
{
this.getPlayerInv().setInventorySlotContents( this.getPlayerInv().currentItem, this.toolInv.getItemStack() );
}
src/main/java/appeng/container/implementations/ContainerStorageBus.java
+2 -2
View File
@@ -165,8 +165,8 @@ public class ContainerStorageBus extends ContainerUpgradeable
{
if( i.hasNext() && this.isSlotEnabled( ( x / 9 ) - 2 ) )
{
final ItemStack g = i.next().getItemStack();
g.setCount( 1 );
// TODO: check if ok
final ItemStack g = i.next().asItemStackRepresentation();
ItemHandlerUtil.setStackInSlot( inv, x, g );
}
else
src/main/java/appeng/container/implementations/ContainerUpgradeable.java
+1 -1
View File
@@ -245,7 +245,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
{
if( !currentItem.isEmpty() )
{
if( Platform.itemComparisons().isEqualItem( this.tbInventory.getItemStack(), currentItem ) )
if( ItemStack.areItemsEqual( this.tbInventory.getItemStack(), currentItem ) )
{
this.getPlayerInv().setInventorySlotContents( this.tbSlot, this.tbInventory.getItemStack() );
}
src/main/java/appeng/container/slot/SlotCraftingTerm.java
+3 -3
View File
@@ -134,7 +134,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
return;
}
final ItemStack rs = Platform.cloneItemStack( this.getStack() );
final ItemStack rs = this.getStack().copy();
if( rs.isEmpty() )
{
return;
@@ -202,7 +202,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
// update crafting matrix...
ItemStack is = this.getStack();
if( !is.isEmpty() && Platform.itemComparisons().isEqualItem( request, is ) )
if( !is.isEmpty() && ItemStack.areItemsEqual( request, is ) )
{
final ItemStack[] set = new ItemStack[this.getPattern().getSlots()];
// Safeguard for empty slots in the inventory for now
@@ -309,7 +309,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
final IAEItemStack fail = inv.injectItems( AEItemStack.create( set[x] ), Actionable.MODULATE, this.mySrc );
if( fail != null )
{
drops.add( fail.getItemStack() );
drops.add( fail.createItemStack() );
}
}
}