From 84bef300032261ca6530675221298b9681c38153 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Thu, 5 May 2016 13:51:16 +0200
Subject: [PATCH] Clean2

---
 .../java/refinedstorage/tile/TileSolderer.java   | 16 +++-------------
 .../java/refinedstorage/util/UpgradeUtils.java   | 10 ++++++++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java
index 492dd4bb7..37a03b840 100755
--- a/src/main/java/refinedstorage/tile/TileSolderer.java
+++ b/src/main/java/refinedstorage/tile/TileSolderer.java
@@ -11,9 +11,11 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.text.ITextComponent;
 import refinedstorage.container.ContainerSolderer;
 import refinedstorage.inventory.InventorySimple;
+import refinedstorage.item.ItemUpgrade;
 import refinedstorage.tile.solderer.ISoldererRecipe;
 import refinedstorage.tile.solderer.SoldererRegistry;
 import refinedstorage.util.InventoryUtils;
+import refinedstorage.util.UpgradeUtils;
 
 public class TileSolderer extends TileMachine implements IInventory, ISidedInventory {
     public static final String NBT_WORKING = "Working";
@@ -57,7 +59,7 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven
                 markDirty();
             }
         } else if (working) {
-            progress += getSpeed();
+            progress += 1 + UpgradeUtils.getUpgradeCount(upgradesInventory, ItemUpgrade.TYPE_SPEED);
 
             if (progress >= recipe.getDuration()) {
                 if (inventory.getStackInSlot(3) != null) {
@@ -77,18 +79,6 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven
         }
     }
 
-    public int getSpeed() {
-        int speed = 1;
-
-        for (int i = 0; i < upgradesInventory.getSizeInventory(); ++i) {
-            if (upgradesInventory.getStackInSlot(i) != null) {
-                speed += 1;
-            }
-        }
-
-        return speed;
-    }
-
     @Override
     public void onDisconnected() {
         super.onDisconnected();
diff --git a/src/main/java/refinedstorage/util/UpgradeUtils.java b/src/main/java/refinedstorage/util/UpgradeUtils.java
index 1cd1581d1..7592878a2 100755
--- a/src/main/java/refinedstorage/util/UpgradeUtils.java
+++ b/src/main/java/refinedstorage/util/UpgradeUtils.java
@@ -19,12 +19,18 @@ public class UpgradeUtils {
     }
 
     public static boolean hasUpgrade(InventorySimple inventory, int type) {
+        return getUpgradeCount(inventory, type) > 0;
+    }
+
+    public static int getUpgradeCount(InventorySimple inventory, int type) {
+        int upgrades = 0;
+
         for (int i = 0; i < inventory.getSizeInventory(); ++i) {
             if (inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).getMetadata() == type) {
-                return true;
+                upgrades++;
             }
         }
 
-        return false;
+        return upgrades;
     }
 }