From c5417f20ceafea8e8dabb40afbc64e6d6b6b61b8 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 1 Aug 2017 22:57:32 +0200 Subject: cherry pick Commit: ecf7b4aa504315528810f3a66867788810b00ab0 [ecf7b4a] Empty slots are only used as IntCirc(0) if no other IntCirc is in input --- .../implementations/GT_MetaTileEntity_BasicMachine.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 4704fb753e..0a31298df9 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; @@ -633,6 +634,7 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B protected ItemStack[] getAllInputs() { ItemStack[] rInputs = new ItemStack[mInputSlotCount]; int emptySlotLocation = -1; + boolean foundIntegratedCircuit = false; for (int i = 0; i < mInputSlotCount; i++){ ItemStack currentInput = getInputAt(i); if (emptySlotLocation == -1) { @@ -641,9 +643,13 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B continue; } } - rInputs[i] = currentInput; + if (!foundIntegratedCircuit && currentInput != null && currentInput.getItem() instanceof GT_IntegratedCircuit_Item) { + foundIntegratedCircuit = true; + } + + rInputs[i] = currentInput; } - if (emptySlotLocation != -1) { + if (emptySlotLocation != -1 && !foundIntegratedCircuit) { rInputs[emptySlotLocation] = GT_Utility.getIntegratedCircuit(0); } return rInputs; -- cgit