From cec6c2422102c781ca448a5c7871ba2fee2a239e Mon Sep 17 00:00:00 2001 From: Johannes Gäßler Date: Sun, 13 Aug 2017 09:08:24 +0200 Subject: cherry pick Commit: a184258c98049a713eca0cf4dcac9f69c41ad5b4 [a184258] Reverted the changes to basic machine processing. Basic Machines no longer automatically add an integrated circuit to their input. --- .../GT_MetaTileEntity_BasicMachine.java | 29 +++------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'src/main/java/gregtech/api/metatileentity') 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 bdf198bf4c..2ecdd039a1 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 @@ -13,8 +13,8 @@ import gregtech.api.objects.GT_RenderedTexture; 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 gregtech.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -632,31 +632,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; } -- cgit