tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Rename to destination

Browse source
This commit is contained in:
thatsIch 2014-11-04 11:48:26 +01:00
parent b123419486
commit fe7510d607
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/appeng/container/AEBaseContainer.java
View file

@ -400,15 +400,15 @@ public abstract class AEBaseContainer extends Container
for (Object inventorySlot : this.inventorySlots)
{
AppEngSlot cs = (AppEngSlot) inventorySlot;
ItemStack dest = cs.getStack();
ItemStack destination = cs.getStack();
if ( !(cs.isPlayerSide()) && cs instanceof SlotFake )
{
if ( Platform.isSameItemPrecise( dest, tis ) )
if ( Platform.isSameItemPrecise( destination, tis ) )
{
return null;
}
else if ( dest == null )
else if ( destination == null )
{
cs.putStack( tis.copy() );
cs.onSlotChanged();

16
src/main/java/appeng/util/inv/AdaptorList.java
View file

@ -19,7 +19,7 @@ public class AdaptorList extends InventoryAdaptor
}
@Override
public ItemStack removeSimilarItems(int how_many, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination dest)
public ItemStack removeSimilarItems(int how_many, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination)
{
int s = i.size();
for (int x = 0; x < s; x++)
@ -29,7 +29,7 @@ public class AdaptorList extends InventoryAdaptor
{
if ( how_many > is.stackSize )
how_many = is.stackSize;
if ( dest != null && !dest.canInsert( is ) )
if ( destination != null && !destination.canInsert( is ) )
how_many = 0;
if ( how_many > 0 )
@ -50,7 +50,7 @@ public class AdaptorList extends InventoryAdaptor
}
@Override
public ItemStack simulateSimilarRemove(int how_many, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination dest)
public ItemStack simulateSimilarRemove(int how_many, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination)
{
for (ItemStack is : i)
{
@ -60,7 +60,7 @@ public class AdaptorList extends InventoryAdaptor
{
how_many = is.stackSize;
}
if ( dest != null && !dest.canInsert( is ) )
if ( destination != null && !destination.canInsert( is ) )
{
how_many = 0;
}
@ -78,7 +78,7 @@ public class AdaptorList extends InventoryAdaptor
}
@Override
public ItemStack removeItems(int how_many, ItemStack filter, IInventoryDestination dest)
public ItemStack removeItems(int how_many, ItemStack filter, IInventoryDestination destination)
{
int s = i.size();
for (int x = 0; x < s; x++)
@ -88,7 +88,7 @@ public class AdaptorList extends InventoryAdaptor
{
if ( how_many > is.stackSize )
how_many = is.stackSize;
if ( dest != null && !dest.canInsert( is ) )
if ( destination != null && !destination.canInsert( is ) )
how_many = 0;
if ( how_many > 0 )
@ -109,7 +109,7 @@ public class AdaptorList extends InventoryAdaptor
}
@Override
public ItemStack simulateRemove(int how_many, ItemStack filter, IInventoryDestination dest)
public ItemStack simulateRemove(int how_many, ItemStack filter, IInventoryDestination destination)
{
for (ItemStack is : i)
{
@ -119,7 +119,7 @@ public class AdaptorList extends InventoryAdaptor
{
how_many = is.stackSize;
}
if ( dest != null && !dest.canInsert( is ) )
if ( destination != null && !destination.canInsert( is ) )
{
how_many = 0;
}

8
src/main/java/appeng/util/inv/AdaptorPlayerHand.java
View file

@ -26,7 +26,7 @@ public class AdaptorPlayerHand extends InventoryAdaptor
}
@Override
public ItemStack removeSimilarItems( int how_many, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination dest )
public ItemStack removeSimilarItems( int how_many, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
{
ItemStack hand = p.inventory.getItemStack();
if ( hand == null )
@ -46,7 +46,7 @@ public class AdaptorPlayerHand extends InventoryAdaptor
}
@Override
public ItemStack simulateSimilarRemove( int how_many, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination dest )
public ItemStack simulateSimilarRemove( int how_many, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination destination )
{
ItemStack hand = p.inventory.getItemStack();
@ -64,7 +64,7 @@ public class AdaptorPlayerHand extends InventoryAdaptor
}
@Override
public ItemStack removeItems( int how_many, ItemStack Filter, IInventoryDestination dest )
public ItemStack removeItems( int how_many, ItemStack Filter, IInventoryDestination destination )
{
ItemStack hand = p.inventory.getItemStack();
if ( hand == null )
@ -84,7 +84,7 @@ public class AdaptorPlayerHand extends InventoryAdaptor
}
@Override
public ItemStack simulateRemove( int how_many, ItemStack Filter, IInventoryDestination dest )
public ItemStack simulateRemove( int how_many, ItemStack Filter, IInventoryDestination destination )
{
ItemStack hand = p.inventory.getItemStack();