diff options
Diffstat (limited to 'src/main/java/tectech/thing/metaTileEntity/hatch')
4 files changed, 9 insertions, 11 deletions
diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java index e226162312..30af3d838b 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java @@ -133,13 +133,12 @@ public class MTEHatchCapacitor extends MTEHatch implements IAddUIWidgets { long tier = -1; long tCurrent = 0; long tEnergyMax = 0; - for (int i = 0; i < mInventory.length; i++) { - if (mInventory[i] == null || mInventory[i].stackSize != 1) { - continue; - } - CapacitorComponent cap = componentBinds.get(TTUtility.getUniqueIdentifier(mInventory[i])); - if (cap != null && cap.tier > tier) { - tier = cap.tier; + for (ItemStack stack : mInventory) { + if (stack != null && stack.stackSize == 1) { + CapacitorComponent cap = componentBinds.get(TTUtility.getUniqueIdentifier(stack)); + if (cap != null && cap.tier > tier) { + tier = cap.tier; + } } } if (tier >= 0) { diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java index 4db38300d4..2532070421 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java @@ -179,7 +179,7 @@ public class MTEHatchDataItemsInput extends MTEHatchDataAccess implements IConne stacks.add(stack); } } - if (stacks.size() > 0) { + if (!stacks.isEmpty()) { this.stacks = stacks.toArray(TTRecipeAdder.nullItem); } } diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java index a9c2ef40cd..bb9be3aa03 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java @@ -258,8 +258,8 @@ public class MTEHatchParamText extends MTEHatchParam { parse(str); return str; } catch (Exception e) { - return widget.getLastText() - .size() > 0 ? widget.getLastText() + return !widget.getLastText() + .isEmpty() ? widget.getLastText() .get(0) : ""; } }) diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java index bf77847d50..4decc0a4a8 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java @@ -190,7 +190,6 @@ public class MTEHatchRack extends MTEHatch implements IAddGregtechLogo, IAddUIWi if (tickingComponents) { if (this.heat > comp.maxHeat) { mInventory[i] = null; - continue; } else if (comp.subZero || this.heat >= 0) { heat += (1f + comp.coolConstant * this.heat / 100000f) * (comp.heatConstant > 0 ? comp.heatConstant * overclock * overvolt * overvolt : -10f); |