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

Replaced normal for loops with foreach loops which is less error prone when just iterating over collection/array

Browse Source
This commit is contained in:
thatsIch
2014-09-29 09:23:02 +02:00
parent 72106c877d
commit caffaef835
15 changed files with 88 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+16 -8
View File
@@ -359,28 +359,32 @@ public abstract class AEBaseContainer extends Container
tis = shiftStoreItem( tis );
// target slots in the container...
for (int x = 0; x < this.inventorySlots.size(); x++)
for (Object inventorySlot : this.inventorySlots)
{
AppEngSlot cs = (AppEngSlot) this.inventorySlots.get( x );
AppEngSlot cs = (AppEngSlot) inventorySlot;
if ( !(cs.isPlayerSide()) && !(cs instanceof SlotFake) && !(cs instanceof SlotCraftingMatrix) )
{
if ( cs.isItemValid( tis ) )
{
selectedSlots.add( cs );
}
}
}
}
else
{
// target slots in the container...
for (int x = 0; x < this.inventorySlots.size(); x++)
for (Object inventorySlot : this.inventorySlots)
{
AppEngSlot cs = (AppEngSlot) this.inventorySlots.get( x );
AppEngSlot cs = (AppEngSlot) inventorySlot;
if ( (cs.isPlayerSide()) && !(cs instanceof SlotFake) && !(cs instanceof SlotCraftingMatrix) )
{
if ( cs.isItemValid( tis ) )
{
selectedSlots.add( cs );
}
}
}
}
@@ -393,15 +397,17 @@ public abstract class AEBaseContainer extends Container
if ( tis != null )
{
// target slots in the container...
for (int x = 0; x < this.inventorySlots.size(); x++)
for (Object inventorySlot : this.inventorySlots)
{
AppEngSlot cs = (AppEngSlot) this.inventorySlots.get( x );
AppEngSlot cs = (AppEngSlot) inventorySlot;
ItemStack dest = cs.getStack();
if ( !(cs.isPlayerSide()) && cs instanceof SlotFake )
{
if ( Platform.isSameItemPrecise( dest, tis ) )
{
return null;
}
else if ( dest == null )
{
cs.putStack( tis.copy() );
@@ -562,12 +568,14 @@ public abstract class AEBaseContainer extends Container
if ( Platform.isServer() )
{
for (int i = 0; i < this.crafters.size(); ++i)
for (Object crafter : this.crafters)
{
ICrafting icrafting = (ICrafting) this.crafters.get( i );
ICrafting icrafting = (ICrafting) crafter;
for (SyncDat sd : syncData.values())
{
sd.tick( icrafting );
}
}
}