Reverted the changes to basic machine processing.

Basic Machines no longer automatically add an integrated circuit to
their input.

2 files changed, 3 insertions, 35 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 2980a22a47..fe8c22c77b 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,7 +14,6 @@ import gregtech.api.objects.XSTR;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.common.items.GT_IntegratedCircuit_Item;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -602,30 +601,8 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
     }
 
     protected ItemStack[] getAllInputs() {
-        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);
-    	}
+        ItemStack[] rInputs = new ItemStack[mInputSlotCount];
+        for (int i = 0; i < mInputSlotCount; i++) rInputs[i] = getInputAt(i);
         return rInputs;
     }
 
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index d5a8be865f..f34aef63bb 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -9,7 +9,6 @@ import gregtech.api.objects.GT_FluidStack;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
-import gregtech.common.items.GT_IntegratedCircuit_Item;
 import gregtech.nei.GT_NEI_DefaultHandler.FixedPositionedStack;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -161,15 +160,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         mFluidInputs = aFluidInputs;
         mFluidOutputs = aFluidOutputs;
         mDuration = aDuration;
-        if (aSpecialValue == 0) {
-        	for (ItemStack input : mInputs) {
-        		if (input != null && input.getItem() instanceof GT_IntegratedCircuit_Item && input.getItemDamage() == 0) {
-        			mSpecialValue = -300;
-        		}
-        	}
-        } else {
-            mSpecialValue = aSpecialValue;        	
-        }
+        mSpecialValue = aSpecialValue;        	
         mEUt = aEUt;
 
 //		checkCellBalance();