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

Merge branch 'iir-cache' into AE2-Omnifactory

Browse Source
This commit is contained in:
Salomão
2021-05-08 22:46:56 -03:00
parent 62d1d904c6 366b31b3aa
commit f3877aa1ec
2 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/automation/PartImportBus.java
+9 -3
View File
@@ -219,8 +219,9 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
{ {
final int toSend = this.calculateMaximumAmountToImport( myAdaptor, whatToImport, inv, fzMode ); final int toSend = this.calculateMaximumAmountToImport( myAdaptor, whatToImport, inv, fzMode );
if( toSend == 0 ){ if( toSend == 0 )
return false; {
return true;
} }
final ItemStack newItems; final ItemStack newItems;
@@ -291,9 +292,14 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
itemAmountNotStorable = inv.injectItems( AEItemStack.fromItemStack( simResult ), Actionable.SIMULATE, this.source ); itemAmountNotStorable = inv.injectItems( AEItemStack.fromItemStack( simResult ), Actionable.SIMULATE, this.source );
} }
if( simResult.isEmpty() )
{
return 0;
}
if( itemAmountNotStorable != null ) if( itemAmountNotStorable != null )
{ {
if (simResult.getCount() == itemAmountNotStorable.getStackSize()) if( simResult.getCount() == itemAmountNotStorable.getStackSize() )
{ {
return 0; return 0;
} }
src/main/java/appeng/parts/misc/ItemRepositoryAdapter.java
+33 -10
View File
@@ -71,13 +71,24 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
if( type == Actionable.MODULATE ) if( type == Actionable.MODULATE )
{ {
try if (this.cache.cachedAeStacks.length == 0) this.cache.update();
boolean found = false;
for (IAEItemStack iaeItemStack : this.cache.cachedAeStacks)
{ {
this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() ); if( iaeItemStack == null )
{
continue;
}
if( iaeItemStack.equals( iox ) )
{
found = true;
iaeItemStack.incStackSize( iox.getStackSize() );
}
} }
catch( GridAccessException ex ) if (!found)
{ {
// meh this.cache.cachedAeStacks = Arrays.copyOf( this.cache.cachedAeStacks, this.cache.cachedAeStacks.length + 1 );
this.cache.cachedAeStacks[this.cache.cachedAeStacks.length - 1] = iox.copy();
} }
} }
@@ -107,15 +118,27 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
if( !extracted.isEmpty() ) if( !extracted.isEmpty() )
{ {
if (this.cache.cachedAeStacks.length == 0) this.cache.update();
IAEItemStack iaeExtracted = AEItemStack.fromItemStack( extracted );
if( mode == Actionable.MODULATE ) if( mode == Actionable.MODULATE )
{ {
try for ( int i = 0; i < this.cache.cachedAeStacks.length; i++ )
{ {
this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() ); IAEItemStack iaeItemStack = this.cache.cachedAeStacks[i];
} if( iaeExtracted.equals( iaeItemStack ) )
catch( GridAccessException ex ) {
{ if( iaeExtracted.getStackSize() >= iaeItemStack.getStackSize() )
// meh {
iaeExtracted.decStackSize( iaeItemStack.getStackSize() );
this.cache.cachedAeStacks[i] = null;
}
else
{
iaeItemStack.decStackSize( iaeExtracted.getStackSize() );
break;
}
}
} }
} }