Machine code changes from bloodasp code

6 files changed, 19 insertions, 29 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
index 04014b5987..a4a88ff564 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java
@@ -154,6 +154,7 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch {
                                     && (!consumeFluid(((ChunkPosition) this.mPumpList.get(this.mPumpList.size() - 1)).chunkPosX,
                                     ((ChunkPosition) this.mPumpList.get(this.mPumpList.size() - 1)).chunkPosY,
                                     ((ChunkPosition) this.mPumpList.remove(this.mPumpList.size() - 1)).chunkPosZ))) {
+                                //Should this be empty?
                             }
                             this.mPumpTimer = GT_Utility.safeInt(160 / (long)Math.pow(2, this.mTier) );
                             this.mPumpTimer = mPumpTimer==0 ? 1 : mPumpTimer;
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
index 0afdcc9669..a142148fc3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
@@ -91,8 +91,6 @@ public class GT_MetaTileEntity_Replicator
             Materials tMaterial;
             for (Iterator i$ = Materials.VALUES.iterator(); i$.hasNext(); sHeaviestElementMass = Math.max(sHeaviestElementMass, (int) tMaterial.getMass())) {
                 tMaterial = (Materials) i$.next();
-                if ((tMaterial.mElement == null) || (tMaterial.mElement.mIsIsotope)) {
-                }
             }
         }
         return sHeaviestElementMass;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
index 2f5070b071..5fd0ea2aaa 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
@@ -32,7 +32,6 @@ import java.util.ArrayList;
 public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBase {
 
     private final ArrayList<ChunkPosition> mMineList = new ArrayList();
-    private boolean completedCycle = false;
 
     public GT_MetaTileEntity_AdvMiner2(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index c6a103cfaa..cc16776ffe 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -205,7 +205,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
                 }
             }
         }
-        this.mHeatingCapacity += 100 * (GT_Utility.getTier(getMaxInputVoltage()) - 3);
+        this.mHeatingCapacity += 100 * (GT_Utility.getTier(getMaxInputVoltage()) - 1);
         return true;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
index 7e1113f635..a518608355 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
@@ -104,26 +104,20 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
                 && (addIfInjector(xCenter - 6, yCenter - 1, zCenter + 1, aBaseMetaTileEntity)) && (addIfInjector(xCenter + 6, yCenter - 1, zCenter + 1, aBaseMetaTileEntity))
                 && (addIfInjector(xCenter - 6, yCenter - 1, zCenter - 1, aBaseMetaTileEntity)) && (addIfInjector(xCenter + 6, yCenter - 1, zCenter - 1, aBaseMetaTileEntity))
                 && (this.mEnergyHatches.size() >= 1) && (this.mOutputHatches.size() >= 1) && (this.mInputHatches.size() >= 2)) {
-            if (this.mEnergyHatches != null) {
-                int mEnergyHatches_sS=this.mEnergyHatches.size();
-                for (int i = 0; i < mEnergyHatches_sS; i++) {
-                    if (this.mEnergyHatches.get(i).mTier < tier())
-                        return false;
-                }
+            int mEnergyHatches_sS = this.mEnergyHatches.size();
+            for (int i = 0; i < mEnergyHatches_sS; i++) {
+                if (this.mEnergyHatches.get(i).mTier < tier())
+                    return false;
             }
-            if (this.mOutputHatches != null) {
-                int mOutputHatches_sS=this.mOutputHatches.size();
-                for (int i = 0; i < mOutputHatches_sS; i++) {
-                    if (this.mOutputHatches.get(i).mTier < tier())
-                        return false;
-                }
+            int mOutputHatches_sS = this.mOutputHatches.size();
+            for (int i = 0; i < mOutputHatches_sS; i++) {
+                if (this.mOutputHatches.get(i).mTier < tier())
+                    return false;
             }
-            if (this.mInputHatches != null) {
-                int mInputHatches_sS=this.mInputHatches.size();
-                for (int i = 0; i < mInputHatches_sS; i++) {
-                    if (this.mInputHatches.get(i).mTier < tier())
-                        return false;
-                }
+            int mInputHatches_sS = this.mInputHatches.size();
+            for (int i = 0; i < mInputHatches_sS; i++) {
+                if (this.mInputHatches.get(i).mTier < tier())
+                    return false;
             }
             mWrench = true;
             mScrewdriver = true;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index b2addfa378..cb93a43c17 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -288,13 +288,11 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
                 this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
                 List<ItemStack> overStacks = new ArrayList<ItemStack>();
                 for (int f = 0; f < tOut.length; f++) {
-                    if (tOut[f].getMaxStackSize() < tOut[f].stackSize) {
-                        while (tOut[f].getMaxStackSize() < tOut[f].stackSize) {
-                            ItemStack tmp = tOut[f].copy();
-                            tmp.stackSize = tmp.getMaxStackSize();
-                            tOut[f].stackSize = tOut[f].stackSize - tOut[f].getMaxStackSize();
-                            overStacks.add(tmp);
-                        }
+                    while (tOut[f].getMaxStackSize() < tOut[f].stackSize) {
+                        ItemStack tmp = tOut[f].copy();
+                        tmp.stackSize = tmp.getMaxStackSize();
+                        tOut[f].stackSize = tOut[f].stackSize - tOut[f].getMaxStackSize();
+                        overStacks.add(tmp);
                     }
                 }
                 if (overStacks.size() > 0) {