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

Port to 1.11

Browse Source
This commit is contained in:
yueh
2016-12-08 12:42:00 +01:00
parent 589730bfad
commit ed9e6dd21c
262 changed files with 4027 additions and 3954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/automation/PartImportBus.java
+6 -6
View File
@@ -99,7 +99,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
{
return true;
}
return out.getStackSize() != stack.stackSize;
return out.getStackSize() != stack.getCount();
}
@Override
@@ -226,9 +226,9 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
if( newItems != null )
{
newItems.stackSize = (int) ( Math.min( newItems.stackSize,
energy.extractAEPower( newItems.stackSize, Actionable.SIMULATE, PowerMultiplier.CONFIG ) ) + 0.01 );
this.itemToSend -= newItems.stackSize;
newItems.setCount( (int) ( Math.min( newItems.getCount(),
energy.extractAEPower( newItems.getCount(), Actionable.SIMULATE, PowerMultiplier.CONFIG ) ) + 0.01 ) );
this.itemToSend -= newItems.getCount();
if( this.lastItemChecked == null || !this.lastItemChecked.isSameType( newItems ) )
{
@@ -236,7 +236,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
}
else
{
this.lastItemChecked.setStackSize( newItems.stackSize );
this.lastItemChecked.setStackSize( newItems.getCount() );
}
final IAEItemStack failed = Platform.poweredInsert( energy, this.destination, this.lastItemChecked, this.source );
@@ -288,7 +288,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
if( itemAmountNotStorable != null )
{
return (int) Math.min( simResult.stackSize - itemAmountNotStorable.getStackSize(), toSend );
return (int) Math.min( simResult.getCount() - itemAmountNotStorable.getStackSize(), toSend );
}
return toSend;