diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 7a6f6de12..a273d0c4a 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -394,11 +394,10 @@ public abstract class AEBaseGui extends GuiContainer else if ( dbl_whichItem != null ) { // a replica of the weird broken vanilla feature. - Iterator iterator = this.inventorySlots.inventorySlots.iterator(); - while (iterator.hasNext()) + for (Object inventorySlot : this.inventorySlots.inventorySlots) { - Slot targetSlot = (Slot) iterator.next(); + Slot targetSlot = (Slot) inventorySlot; if ( targetSlot != null && targetSlot.canTakeStack( this.mc.thePlayer ) && targetSlot.getHasStack() && targetSlot.inventory == slot.inventory && Container.func_94527_a( targetSlot, dbl_whichItem, true ) ) diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index 902616589..289cd3027 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -251,12 +251,12 @@ public class GuiCraftConfirm extends AEBaseGui private IAEItemStack findVisualStack(IAEItemStack l) { - Iterator i = visual.iterator(); - while (i.hasNext()) + for (IAEItemStack o : visual) { - IAEItemStack o = i.next(); if ( o.equals( l ) ) + { return o; + } } IAEItemStack stack = l.copy(); diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index b3de50051..275831b8b 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -169,12 +169,12 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource private IAEItemStack findVisualStack(IAEItemStack l) { - Iterator i = visual.iterator(); - while (i.hasNext()) + for (IAEItemStack o : visual) { - IAEItemStack o = i.next(); if ( o.equals( l ) ) + { return o; + } } IAEItemStack stack = l.copy(); diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index b7e624036..f813c1d38 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -209,12 +209,12 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper if ( machine instanceof ICraftingRequester ) { - Iterator nex = links.values().iterator(); - while (nex.hasNext()) + for (CraftingLinkNexus n : links.values()) { - CraftingLinkNexus n = nex.next(); if ( n.isMachine( machine ) ) + { n.removeNode(); + } } } diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index 8a4e1448d..2e0808e74 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/src/main/java/appeng/me/storage/CellInventory.java @@ -89,15 +89,15 @@ public class CellInventory implements ICellInventory // add new pretty stuff... int x = 0; - Iterator i = cellItems.iterator(); - while (i.hasNext()) + for (IAEItemStack v : cellItems) { - IAEItemStack v = i.next(); itemCount += v.getStackSize(); NBTBase c = tagCompound.getTag( ITEM_SLOT_ARR[x] ); if ( c instanceof NBTTagCompound ) + { v.writeToNBT( (NBTTagCompound) c ); + } else { NBTTagCompound g = new NBTTagCompound(); diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index 6ceefbf10..b8f87af7c 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -155,12 +155,8 @@ public class NetworkInventoryHandler> implements IMEInvent return input; } - Iterator>> i = priorityInventory.values().iterator();// asMap().entrySet().iterator(); - - while (i.hasNext()) + for (List> invList : priorityInventory.values()) { - List> invList = i.next(); - Iterator> ii = invList.iterator(); while (ii.hasNext() && input != null) { @@ -168,7 +164,9 @@ public class NetworkInventoryHandler> implements IMEInvent if ( inv.validForPass( 1 ) && inv.canAccept( input ) && (inv.isPrioritized( input ) || inv.extractItems( input, Actionable.SIMULATE, src ) != null) ) + { input = inv.injectItems( input, type, src ); + } } ii = invList.iterator(); @@ -176,7 +174,9 @@ public class NetworkInventoryHandler> implements IMEInvent { IMEInventoryHandler inv = ii.next(); if ( inv.validForPass( 2 ) && inv.canAccept( input ) )// ignore crafting on the second pass. + { input = inv.injectItems( input, type, src ); + } } } diff --git a/src/main/java/appeng/recipes/game/ShapelessRecipe.java b/src/main/java/appeng/recipes/game/ShapelessRecipe.java index a1c46f2da..7ab274244 100644 --- a/src/main/java/appeng/recipes/game/ShapelessRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapelessRecipe.java @@ -79,13 +79,12 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable if ( slot != null ) { boolean inRecipe = false; - Iterator req = required.iterator(); - while (req.hasNext()) + for (Object aRequired : required) { boolean match = false; - Object next = req.next(); + Object next = aRequired; if ( next instanceof IIngredient ) { diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 5011c7638..6fe6f951a 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -398,17 +398,19 @@ public class Platform if ( cA.size() != cB.size() ) return false; - Iterator i = cA.iterator(); - while (i.hasNext()) + for (String name : cA) { - String name = i.next(); NBTBase tag = ctA.getTag( name ); NBTBase aTag = ctB.getTag( name ); if ( aTag == null ) + { return false; + } if ( !NBTEqualityTest( tag, aTag ) ) + { return false; + } } return true; @@ -520,10 +522,8 @@ public class Platform Set cA = ctA.func_150296_c(); - Iterator i = cA.iterator(); - while (i.hasNext()) + for (String name : cA) { - String name = i.next(); hash += name.hashCode() ^ NBTOrderlessHash( ctA.getTag( name ) ); } diff --git a/src/main/java/appeng/util/item/AESharedNBT.java b/src/main/java/appeng/util/item/AESharedNBT.java index 329cb4018..a2f72241c 100644 --- a/src/main/java/appeng/util/item/AESharedNBT.java +++ b/src/main/java/appeng/util/item/AESharedNBT.java @@ -58,11 +58,9 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound AESharedNBT x = new AESharedNBT( itemID, damageValue ); // c.getTags() - Iterator var2 = c.func_150296_c().iterator(); - - while (var2.hasNext()) + for (Object o : c.func_150296_c()) { - String name = (String) var2.next(); + String name = (String) o; x.setTag( name, c.getTag( name ).copy() ); } diff --git a/src/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java index b92c6e409..829249a6e 100644 --- a/src/main/java/appeng/util/item/ItemList.java +++ b/src/main/java/appeng/util/item/ItemList.java @@ -132,9 +132,10 @@ public final class ItemList implements IItemList i = this.iterator(); - while (i.hasNext()) - return i.next(); + for (StackType stackType : this) + { + return stackType; + } return null; }