diff options
| author | Alkalus <Draknyte1@hotmail.com> | 2020-04-14 00:14:31 +0100 |
|---|---|---|
| committer | Alkalus <Draknyte1@hotmail.com> | 2020-04-14 00:14:31 +0100 |
| commit | 87ab3c0ab5f1b682295e2a010cc88cf4ae7db51c (patch) | |
| tree | 90a590dd3a5593a7f81eedf6433dbef9a6f21e0f /src/Java/gtPlusPlus/core/slots | |
| parent | 492aa5becc6c49cc3afde8c855b5bbcdc5055e51 (diff) | |
| download | GT5-Unofficial-87ab3c0ab5f1b682295e2a010cc88cf4ae7db51c.tar.gz GT5-Unofficial-87ab3c0ab5f1b682295e2a010cc88cf4ae7db51c.tar.bz2 GT5-Unofficial-87ab3c0ab5f1b682295e2a010cc88cf4ae7db51c.zip | |
% Changed a heap of recipes to use the new circuits.
Diffstat (limited to 'src/Java/gtPlusPlus/core/slots')
| -rw-r--r-- | src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java b/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java index 48b050d678..19795a41e4 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java +++ b/src/Java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java @@ -11,6 +11,7 @@ public class SlotIntegratedCircuit extends Slot { public static Item mCircuitItem; public static Item mCircuitItem2; + public static Item mCircuitItem3; private final short mCircuitLock; public SlotIntegratedCircuit(final IInventory inventory, final int slot, final int x, final int y) { @@ -44,9 +45,12 @@ public class SlotIntegratedCircuit extends Slot { if (mCircuitItem2 == null) { mCircuitItem2 = CI.getNumberedBioCircuit(0).getItem(); } - if (mCircuitItem != null && mCircuitItem2 != null) { + if (mCircuitItem3 == null) { + mCircuitItem3 = CI.getNumberedAdvancedCircuit(0).getItem(); + } + if (mCircuitItem != null && mCircuitItem2 != null && mCircuitItem3 != null) { if (itemstack != null) { - if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2) { + if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2 || itemstack.getItem() == mCircuitItem3) { if (aLockedCircuitNumber == -1) { isValid = true; } @@ -73,7 +77,10 @@ public class SlotIntegratedCircuit extends Slot { if (mCircuitItem2 == null) { mCircuitItem2 = CI.getNumberedBioCircuit(0).getItem(); } - if (mCircuitItem != null && mCircuitItem2 != null) { + if (mCircuitItem3 == null) { + mCircuitItem3 = CI.getNumberedAdvancedCircuit(0).getItem(); + } + if (mCircuitItem != null && mCircuitItem2 != null && mCircuitItem3 != null) { if (itemstack != null) { if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2) { if (itemstack.getItem() == mCircuitItem) { @@ -81,7 +88,10 @@ public class SlotIntegratedCircuit extends Slot { } else if (itemstack.getItem() == mCircuitItem2) { return 1; - } + } + else if (itemstack.getItem() == mCircuitItem3) { + return 2; + } } } } |