Improved readability of variables
Hopefully improved semantics of variables Fixed typos Added hyphenations
This commit is contained in:
@@ -14,12 +14,12 @@ public class InvLayerData
|
||||
|
||||
// cache of inventory state.
|
||||
final private int sides[][];
|
||||
final private List<ISidedInventory> invs;
|
||||
final private List<ISidedInventory> inventories;
|
||||
final private List<InvSot> slots;
|
||||
|
||||
public InvLayerData(int a[][], List<ISidedInventory> b, List<InvSot> c) {
|
||||
sides = a;
|
||||
invs = b;
|
||||
inventories = b;
|
||||
slots = c;
|
||||
}
|
||||
|
||||
@@ -34,10 +34,10 @@ public class InvLayerData
|
||||
return slots != null && slot >= 0 && slot < slots.size();
|
||||
}
|
||||
|
||||
public ItemStack decrStackSize(int slot, int amount)
|
||||
public ItemStack decreaseStackSize(int slot, int amount)
|
||||
{
|
||||
if ( isSlotValid( slot ) )
|
||||
return slots.get( slot ).decrStackSize( amount );
|
||||
return slots.get( slot ).decreaseStackSize( amount );
|
||||
|
||||
return null;
|
||||
}
|
||||
@@ -90,9 +90,9 @@ public class InvLayerData
|
||||
|
||||
public void markDirty()
|
||||
{
|
||||
if ( invs != null )
|
||||
if ( inventories != null )
|
||||
{
|
||||
for (IInventory inv : invs)
|
||||
for (IInventory inv : inventories)
|
||||
inv.markDirty();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ public class InvSot
|
||||
index = slot;
|
||||
}
|
||||
|
||||
public ItemStack decrStackSize(int j)
|
||||
public ItemStack decreaseStackSize(int j)
|
||||
{
|
||||
return partInv.decrStackSize( index, j );
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ public class LayerIEnergySink extends LayerBase implements IEnergySink
|
||||
interested++;
|
||||
}
|
||||
}
|
||||
return interested == 1;// if more then one tile is interested we need to abandonship...
|
||||
return interested == 1;// if more then one tile is interested we need to abandon...
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -84,7 +84,7 @@ public class LayerIEnergySource extends LayerBase implements IEnergySource
|
||||
interested++;
|
||||
}
|
||||
}
|
||||
return interested == 1;// if more then one tile is interested we need to abandonship...
|
||||
return interested == 1;// if more then one tile is interested we need to abandon...
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -39,10 +39,10 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
|
||||
{
|
||||
// cache of inventory state.
|
||||
int sideData[][] = null;
|
||||
List<ISidedInventory> invs = null;
|
||||
List<ISidedInventory> inventories = null;
|
||||
List<InvSot> slots = null;
|
||||
|
||||
invs = new ArrayList();
|
||||
inventories = new ArrayList();
|
||||
int slotCount = 0;
|
||||
|
||||
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
|
||||
@@ -52,13 +52,13 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
|
||||
{
|
||||
ISidedInventory part = (ISidedInventory) bp;
|
||||
slotCount += part.getSizeInventory();
|
||||
invs.add( part );
|
||||
inventories.add( part );
|
||||
}
|
||||
}
|
||||
|
||||
if ( invs.isEmpty() || slotCount == 0 )
|
||||
if ( inventories.isEmpty() || slotCount == 0 )
|
||||
{
|
||||
invs = null;
|
||||
inventories = null;
|
||||
sideData = null;
|
||||
slots = null;
|
||||
}
|
||||
@@ -69,7 +69,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
|
||||
|
||||
int offsetForLayer = 0;
|
||||
int offsetForPart = 0;
|
||||
for (ISidedInventory sides : invs)
|
||||
for (ISidedInventory sides : inventories)
|
||||
{
|
||||
offsetForPart = 0;
|
||||
slotCount = sides.getSizeInventory();
|
||||
@@ -94,7 +94,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
|
||||
if ( sideData == null || slots == null )
|
||||
invLayer = null;
|
||||
else
|
||||
invLayer = new InvLayerData( sideData, invs, slots );
|
||||
invLayer = new InvLayerData( sideData, inventories, slots );
|
||||
|
||||
// make sure inventory is updated before we call FMP.
|
||||
super.notifyNeighbors();
|
||||
@@ -106,7 +106,7 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory
|
||||
if ( invLayer == null )
|
||||
return null;
|
||||
|
||||
return invLayer.decrStackSize( slot, amount );
|
||||
return invLayer.decreaseStackSize( slot, amount );
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user