diff options
author | Johannes Gäßler <updrn@student.kit.edu> | 2017-08-01 10:35:11 +0200 |
---|---|---|
committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-08-01 10:35:11 +0200 |
commit | ecf7b4aa504315528810f3a66867788810b00ab0 (patch) | |
tree | fa7630e712dfee4aef3d06387bf27343622186f8 /src/main/java/gregtech/api/metatileentity/implementations | |
parent | dc31c9ebdb1e1fe199c55c5c3600825e9c6679f3 (diff) | |
download | GT5-Unofficial-ecf7b4aa504315528810f3a66867788810b00ab0.tar.gz GT5-Unofficial-ecf7b4aa504315528810f3a66867788810b00ab0.tar.bz2 GT5-Unofficial-ecf7b4aa504315528810f3a66867788810b00ab0.zip |
Empty slots are only used as IntCirc(0) if no other IntCirc is in input
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java | 7 |
1 files changed, 6 insertions, 1 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 79d364c91d..545c41ec97 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.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; @@ -603,6 +604,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) { @@ -611,9 +613,12 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B continue; } } + 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; |