Merge branch 'HP-Wrough-Iron-Update' into experimental

1 files changed, 26 insertions, 2 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
index b1a74ab303..bdf198bf4c 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
@@ -14,6 +14,7 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.items.GT_IntegratedCircuit_Item;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -631,8 +632,31 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     }
 
     protected ItemStack[] getAllInputs() {
-        ItemStack[] rInputs = new ItemStack[mInputSlotCount];
-        for (int i = 0; i < mInputSlotCount; i++) rInputs[i] = getInputAt(i);
+        ItemStack[] rInputs = new ItemStack[mInputSlotCount + 1];
+        boolean foundEmptySlotOrAreTwoInputsEqual = false;
+        boolean foundIntegratedCircuit = false;
+        for (int i = 0; i < mInputSlotCount; i++){
+        	ItemStack currentInput = getInputAt(i);
+            if (currentInput == null) {
+                foundEmptySlotOrAreTwoInputsEqual = true;
+                continue;
+            }
+            rInputs[i] = currentInput;
+
+            if (!foundIntegratedCircuit && currentInput != null && currentInput.getItem() instanceof GT_IntegratedCircuit_Item) {
+                foundIntegratedCircuit = true;
+            }
+            if (!foundEmptySlotOrAreTwoInputsEqual) {
+                for (int j = 0; j < i; j++) {
+                    if (GT_Utility.areStacksEqual(rInputs[i], rInputs[j])) {
+                        foundEmptySlotOrAreTwoInputsEqual = true;
+                    }
+                }
+            }
+        }
+        if (!foundIntegratedCircuit && foundEmptySlotOrAreTwoInputsEqual) {
+            rInputs[mInputSlotCount] = GT_Utility.getIntegratedCircuit(0);
+        }
         return rInputs;
     }