From 73b68940ce32b61a9b765bf5a34fcef94c08def6 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 21 Nov 2014 13:38:17 -0500 Subject: [PATCH] Clean up solar armor iteration --- .../item/darksteel/DarkSteelController.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index cf3a39f3..af988a97 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -150,25 +150,20 @@ public class DarkSteelController { boolean addExtraRF = player.worldObj.getTotalWorldTime() % 20 < leftover; int toAdd = (RFperSecond / 20) + (addExtraRF ? 1 : 0); - + if(toAdd != 0) { - List validArmors = new ArrayList(); + int nextIndex = player.getEntityData().getInteger("dsarmor:solar") % 4; - // we need to evenly split power between all equipped DS armors - for (int i = 0; i < 4; i++) { - ItemStack stack = player.inventory.armorInventory[i]; + for (int i = 0; i < 4 && toAdd > 0; i++) { + ItemStack stack = player.inventory.armorInventory[nextIndex]; if(EnergyUpgrade.loadFromItem(stack) != null) { - validArmors.add(i); + toAdd -= ((IEnergyContainerItem) stack.getItem()).receiveEnergy(stack, toAdd, false); } + nextIndex = (nextIndex + 1) % 4; } - - int nextToAddTo = player.getEntityData().getInteger("dsarmor:solar"); - ItemStack armor = player.inventory.armorInventory[validArmors.get(nextToAddTo)]; - - ((IEnergyContainerItem) armor.getItem()).receiveEnergy(armor, toAdd, false); - - player.getEntityData().setInteger("dsarmor:solar", (validArmors.indexOf(nextToAddTo) + 1) % validArmors.size()); + + player.getEntityData().setInteger("dsarmor:solar", nextIndex); } }