cherry pick

Commit: 4bfbdcdb1dea4d4e4786e351b591096fb7646351 [4bfbdcd]

Made it so that if two inputs are equal an Integr. Circuit (0) is added

1 files changed, 18 insertions, 13 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 0a31298df9..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
@@ -632,26 +632,31 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     }
 
     protected ItemStack[] getAllInputs() {
-        ItemStack[] rInputs = new ItemStack[mInputSlotCount];
-        int emptySlotLocation = -1;
+        ItemStack[] rInputs = new ItemStack[mInputSlotCount + 1];
+        boolean foundEmptySlotOrAreTwoInputsEqual = false;
         boolean foundIntegratedCircuit = false;
         for (int i = 0; i < mInputSlotCount; i++){
         	ItemStack currentInput = getInputAt(i);
-        	if (emptySlotLocation == -1) {
-            	if (currentInput == null) {
-                	emptySlotLocation = i;
-                	continue;
-            	}
-        	}
+            if (currentInput == null) {
+                foundEmptySlotOrAreTwoInputsEqual = true;
+                continue;
+            }
+            rInputs[i] = currentInput;
+
             if (!foundIntegratedCircuit && currentInput != null && currentInput.getItem() instanceof GT_IntegratedCircuit_Item) {
                 foundIntegratedCircuit = true;
             }
-
-            rInputs[i] = currentInput;
+            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);
         }
-        if (emptySlotLocation != -1 && !foundIntegratedCircuit) {
-        	rInputs[emptySlotLocation] = GT_Utility.getIntegratedCircuit(0);
-    	}
         return rInputs;
     }