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/me/storage/CellInventory.java
+8 -7
View File
@@ -270,14 +270,14 @@ public class CellInventory implements ICellInventory
if( input.getStackSize() > remainingItemCount )
{
final ItemStack toReturn = Platform.cloneItemStack( sharedItemStack );
toReturn.stackSize = sharedItemStack.stackSize - remainingItemCount;
toReturn.setCount( sharedItemStack.getCount() - remainingItemCount );
if( mode == Actionable.MODULATE )
{
final ItemStack toWrite = Platform.cloneItemStack( sharedItemStack );
toWrite.stackSize = remainingItemCount;
toWrite.setCount( remainingItemCount );
this.cellItems.add( AEItemStack.create( toWrite ) );
this.updateItemCount( toWrite.stackSize );
this.updateItemCount( toWrite.getCount() );
this.saveChanges();
}
@@ -461,7 +461,7 @@ public class CellInventory implements ICellInventory
final ItemStack t;
try
{
t = ItemStack.loadItemStackFromNBT( compoundTag );
t = new ItemStack( compoundTag );
if( t == null )
{
AELog.warn( "Removing item " + compoundTag + " from storage cell because the associated item type couldn't be found." );
@@ -478,9 +478,9 @@ public class CellInventory implements ICellInventory
throw ex;
}
t.stackSize = stackSize;
t.setCount( stackSize );
if( t.stackSize > 0 )
if( t.getCount() > 0 )
{
try
{
@@ -555,7 +555,8 @@ public class CellInventory implements ICellInventory
public boolean canHoldNewItem()
{
final long bytesFree = this.getFreeBytes();
return ( bytesFree > this.getBytesPerType() || ( bytesFree == this.getBytesPerType() && this.getUnusedItemCount() > 0 ) ) && this.getRemainingItemTypes() > 0;
return ( bytesFree > this.getBytesPerType() || ( bytesFree == this.getBytesPerType() && this.getUnusedItemCount() > 0 ) ) && this
.getRemainingItemTypes() > 0;
}
@Override
src/main/java/appeng/me/storage/MEMonitorIInventory.java
+4 -4
View File
@@ -98,7 +98,7 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
// better then doing construction from scratch :3
final IAEItemStack o = input.copy();
o.setStackSize( out.stackSize );
o.setStackSize( out.getCount() );
return o;
}
@@ -123,7 +123,7 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
// better then doing construction from scratch :3
final IAEItemStack o = request.copy();
o.setStackSize( out.stackSize );
o.setStackSize( out.getCount() );
if( type == Actionable.MODULATE )
{
@@ -177,8 +177,8 @@ public class MEMonitorIInventory implements IMEMonitor<IAEItemStack>, ITickingMo
}
else
{
final int newSize = ( newIS == null ? 0 : newIS.stackSize );
final int diff = newSize - ( oldIS == null ? 0 : oldIS.stackSize );
final int newSize = ( newIS == null ? 0 : newIS.getCount() );
final int diff = newSize - ( oldIS == null ? 0 : oldIS.getCount() );
final IAEItemStack stack = ( old == null || old.aeStack == null ? AEApi.instance().storage().createItemStack( newIS ) : old.aeStack.copy() );
if( stack != null )